Bump chainlib to take dynamic arg vector for argparse

Update signer to fill in missing sign to wire symbol
2021-09-17 08:12:51 +02:00 · 2021-09-15 21:19:05 +02:00
723 changed files with 415 additions and 187039 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,3 @@ build/
 **/.venv
 .idea
 **/.vim
-**/*secret.yaml
-.env
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,13 +12,13 @@ include:
 stages:
  - build
  - test
-  - deploy
+  - deploy 

-image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/docker-with-compose:latest
+image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/docker-with-compose:latest  

 variables:
  DOCKER_BUILDKIT: "1"
-  COMPOSE_DOCKER_CLI_BUILD: "1"
+  COMPOSE_DOCKER_CLI_BUILD: "1" 
  CI_DEBUG_TRACE: "true"

 before_script:
--- a/README.md
+++ b/README.md
@@ -2,10 +2,6 @@

 ## Getting started 

-### Preperation
-
-Copy the .env_sample file to .env and populate with appropriate env vars
-
 This repo uses docker-compose and docker buildkit. Set the following environment variables to get started:

 ```
@@ -30,7 +26,7 @@ docker-compose down

 stop cluster and delete data
 ```
-docker-compose down -v --remove-orphans
+docker-compose down -v
 ```

 rebuild an images
@@ -38,7 +34,4 @@ rebuild an images
 docker-compose up --build <service_name>
 ```

-to delete the buildkit cache
-```
-docker builder prune --filter type=exec.cachemount
-```
+
--- a/apps/cic-cache/cic_cache/cli/rpc.py
+++ b/apps/cic-cache/cic_cache/cli/rpc.py
@@ -27,11 +27,11 @@ class RPC:
    @staticmethod
    def from_config(config):
        chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-        RPCConnection.register_location(config.get('RPC_PROVIDER'), chain_spec, 'default')
+        RPCConnection.register_location(config.get('RPC_HTTP_PROVIDER'), chain_spec, 'default')
        if config.get('SIGNER_PROVIDER'):
            RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, tag='signer')
            RPCConnection.register_location(config.get('SIGNER_PROVIDER'), chain_spec, 'signer')
-        rpc = RPC(chain_spec, config.get('RPC_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
+        rpc = RPC(chain_spec, config.get('RPC_HTTP_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
        logg.info('set up rpc: {}'.format(rpc))
        return rpc

--- a/apps/cic-cache/requirements.txt
+++ b/apps/cic-cache/requirements.txt
@@ -9,6 +9,7 @@ psycopg2==2.8.6
 celery==4.4.7
 redis==3.5.3
 chainsyncer[sql]>=0.0.6a3,<0.1.0
-erc20-faucet>=0.3.2a2, <0.4.0
-chainlib-eth>=0.0.9a14,<0.1.0
-eth-address-index>=0.2.3a4,<0.3.0
+erc20-faucet>=0.3.2a1, <0.4.0
+chainlib-eth>=0.0.9a7,<0.1.0
+chainlib>=0.0.9a3,<0.1.0
+eth-address-index>=0.2.3a1,<0.3.0
--- a/apps/cic-eth-aux/erc20-demurrage-token/requirements.txt
+++ b/apps/cic-eth-aux/erc20-demurrage-token/requirements.txt
@@ -1,4 +1,5 @@
 celery==4.4.7
 erc20-demurrage-token~=0.0.3a1
-cic-eth-registry>=0.6.1a2,<0.7.0
-cic-eth[services]~=0.12.4a8
+cic-eth-registry~=0.5.8a1
+chainlib~=0.0.7a1
+cic_eth~=0.12.2a4
--- a/apps/cic-eth/admin_requirements.txt
+++ b/apps/cic-eth/admin_requirements.txt
@@ -1,5 +1,5 @@
 SQLAlchemy==1.3.20
-cic-eth-registry>=0.6.1a3,<0.7.0
+cic-eth-registry>=0.6.1a2,<0.7.0
 hexathon~=0.0.1a8
 chainqueue>=0.0.4a6,<0.1.0
 eth-erc20>=0.1.2a2,<0.2.0
--- a/apps/cic-eth/cic_eth/api/api_task.py
+++ b/apps/cic-eth/cic_eth/api/api_task.py
@@ -9,7 +9,6 @@ import logging
 # external imports 
 import celery
 from chainlib.chain import ChainSpec
-from hexathon import strip_0x

 # local imports
 from cic_eth.api.base import ApiBase
@@ -255,8 +254,6 @@ class Api(ApiBase):
        :returns: uuid of root task
        :rtype: celery.Task
        """
-        #from_address = strip_0x(from_address)
-        #to_address = strip_0x(to_address)
        s_check = celery.signature(
                'cic_eth.admin.ctrl.check_lock',
                [
--- a/apps/cic-eth/cic_eth/eth/account.py
+++ b/apps/cic-eth/cic_eth/eth/account.py
@@ -13,7 +13,7 @@ from chainlib.eth.sign import (
        new_account,
        sign_message,
        )
-from chainlib.eth.address import to_checksum_address, is_address
+from chainlib.eth.address import to_checksum_address
 from chainlib.eth.tx import TxFormat
 from chainlib.chain import ChainSpec
 from chainlib.error import JSONRPCException
@@ -31,7 +31,6 @@ from cic_eth.eth.gas import (
 from cic_eth.db.models.nonce import Nonce
 from cic_eth.db.models.base import SessionBase
 from cic_eth.db.models.role import AccountRole
-from cic_eth.encode import tx_normalize
 from cic_eth.error import (
        RoleMissingError,
        SignerError,
@@ -50,7 +49,6 @@ from cic_eth.queue.tx import (
 from cic_eth.encode import (
        unpack_normal,
        ZERO_ADDRESS_NORMAL,
-        tx_normalize,
        )

 logg = logging.getLogger()
@@ -86,7 +84,7 @@ def create(self, password, chain_spec_dict):
    # TODO: It seems infeasible that a can be None in any case, verify
    if a == None:
        raise SignerError('create account')
-    a = tx_normalize.wallet_address(a)
+        
    logg.debug('created account {}'.format(a))

    # Initialize nonce provider record for account
@@ -177,9 +175,6 @@ def gift(self, account_address, chain_spec_dict):
    """
    chain_spec = ChainSpec.from_dict(chain_spec_dict)

-    if is_address(account_address):
-        account_address = tx_normalize.wallet_address(account_address)
-
    logg.debug('gift account address {} to index'.format(account_address))
    queue = self.request.delivery_info.get('routing_key')

@@ -253,9 +248,8 @@ def have(self, account, chain_spec_dict):

@celery_app.task(bind=True, base=CriticalSQLAlchemyTask)
 def set_role(self, tag, address, chain_spec_dict):
-    if not is_address(address):
-        raise ValueError('invalid address {}'.format(address))
-    address = tx_normalize.wallet_address(address)
+    if not to_checksum_address(address):
+        raise ValueError('invalid checksum address {}'.format(address))
    session = SessionBase.create_session()
    role = AccountRole.set(tag, address, session=session) 
    session.add(role)
@@ -304,15 +298,13 @@ def cache_gift_data(
    tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
    tx = unpack_normal(tx_signed_raw_bytes, chain_spec)
    tx_data = Faucet.parse_give_to_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx['to'])

    session = self.create_session()

    tx_dict = {
            'hash': tx['hash'],
-            'from': sender_address,
-            'to': recipient_address,
+            'from': tx['from'],
+            'to': tx['to'],
            'source_token': ZERO_ADDRESS_NORMAL,
            'destination_token': ZERO_ADDRESS_NORMAL,
            'from_value': 0,
@@ -346,14 +338,12 @@ def cache_account_data(
    tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
    tx = unpack_normal(tx_signed_raw_bytes, chain_spec)
    tx_data = AccountsIndex.parse_add_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx['to'])

    session = SessionBase.create_session()
    tx_dict = {
            'hash': tx['hash'],
-            'from': sender_address,
-            'to': recipient_address,
+            'from': tx['from'],
+            'to': tx['to'],
            'source_token': ZERO_ADDRESS_NORMAL,
            'destination_token': ZERO_ADDRESS_NORMAL,
            'from_value': 0,
--- a/apps/cic-eth/cic_eth/eth/erc20.py
+++ b/apps/cic-eth/cic_eth/eth/erc20.py
@@ -12,10 +12,7 @@ from chainlib.eth.tx import (
        )
 from cic_eth_registry import CICRegistry
 from cic_eth_registry.erc20 import ERC20Token
-from hexathon import (
-        strip_0x,
-        add_0x,
-        )
+from hexathon import strip_0x
 from chainqueue.error import NotLocalTxError
 from eth_erc20 import ERC20
 from chainqueue.sql.tx import cache_tx_dict
@@ -41,7 +38,6 @@ from cic_eth.task import (
        CriticalSQLAlchemyAndSignerTask,
    )
 from cic_eth.eth.nonce import CustodialTaskNonceOracle
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app
 logg = logging.getLogger()
@@ -66,8 +62,7 @@ def balance(tokens, holder_address, chain_spec_dict):

    for t in tokens:
        address = t['address']
-        logg.debug('address {} {}'.format(address, holder_address))
-        token = ERC20Token(chain_spec, rpc, add_0x(address))
+        token = ERC20Token(chain_spec, rpc, address)
        c = ERC20(chain_spec)
        o = c.balance_of(address, holder_address, sender_address=caller_address)
        r = rpc.do(o)
@@ -376,15 +371,13 @@ def cache_transfer_data(
    tx = unpack(tx_signed_raw_bytes, chain_spec)

    tx_data = ERC20.parse_transfer_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx_data[0])
+    recipient_address = tx_data[0]
    token_value = tx_data[1]

-
    session = SessionBase.create_session()
    tx_dict = {
            'hash': tx_hash_hex,
-            'from': sender_address,
+            'from': tx['from'],
            'to': recipient_address,
            'source_token': tx['to'],
            'destination_token': tx['to'],
@@ -455,14 +448,13 @@ def cache_approve_data(
    tx = unpack(tx_signed_raw_bytes, chain_spec)

    tx_data = ERC20.parse_approve_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx_data[0])
+    recipient_address = tx_data[0]
    token_value = tx_data[1]

    session = SessionBase.create_session()
    tx_dict = {
            'hash': tx_hash_hex,
-            'from': sender_address,
+            'from': tx['from'],
            'to': recipient_address,
            'source_token': tx['to'],
            'destination_token': tx['to'],
--- a/apps/cic-eth/cic_eth/eth/gas.py
+++ b/apps/cic-eth/cic_eth/eth/gas.py
@@ -9,11 +9,7 @@ from hexathon import (
        )
 #from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.chain import ChainSpec
-from chainlib.eth.address import (
-        is_checksum_address,
-        to_checksum_address,
-        is_address
-        )
+from chainlib.eth.address import is_checksum_address
 from chainlib.connection import RPCConnection
 from chainqueue.db.enum import StatusBits
 from chainqueue.sql.tx import cache_tx_dict
@@ -78,6 +74,7 @@ class MaxGasOracle:
        return MAXIMUM_FEE_UNITS


+#def create_check_gas_task(tx_signed_raws_hex, chain_spec, holder_address, gas=None, tx_hashes_hex=None, queue=None):
 def create_check_gas_task(tx_signed_raws_hex, chain_spec, holder_address, gas=None, tx_hashes_hex=None, queue=None):
    """Creates a celery task signature for a check_gas task that adds the task to the outgoing queue to be processed by the dispatcher.

@@ -182,9 +179,8 @@ def check_gas(self, tx_hashes_hex, chain_spec_dict, txs_hex=[], address=None, ga
    :return: Signed raw transaction data list
    :rtype: param txs, unchanged
    """
-    rpc_format_address = None
    if address != None:
-        if not is_address(address):
+        if not is_checksum_address(address):
            raise ValueError('invalid address {}'.format(address))
        address = tx_normalize.wallet_address(address)
        address = add_0x(address)
@@ -199,6 +195,7 @@ def check_gas(self, tx_hashes_hex, chain_spec_dict, txs_hex=[], address=None, ga
        txs.append(tx)

    chain_spec = ChainSpec.from_dict(chain_spec_dict)
+    logg.debug('txs {} tx_hashes {}'.format(txs, tx_hashes))

    addresspass = None
    if len(txs) == 0:
@@ -214,15 +211,13 @@ def check_gas(self, tx_hashes_hex, chain_spec_dict, txs_hex=[], address=None, ga
                raise ValueError('txs passed to check gas must all have same sender; had {} got {}'.format(address, tx['from']))
            addresspass.append(address)

-    rpc_format_address = add_0x(to_checksum_address(address))
-
    queue = self.request.delivery_info.get('routing_key')

    conn = RPCConnection.connect(chain_spec)

    gas_balance = 0
    try:
-        o = balance(rpc_format_address)
+        o = balance(address)
        r = conn.do(o)
        conn.disconnect()
        gas_balance = abi_decode_single(ABIContractType.UINT256, r)
--- a/apps/cic-eth/cic_eth/eth/meta.py
+++ b/apps/cic-eth/cic_eth/eth/meta.py
@@ -2,9 +2,8 @@
 from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.status import Status as TxStatus
 from cic_eth_registry.erc20 import ERC20Token
-from hexathon import add_0x

-# local impor:ts
+# local imports
 from cic_eth.ext.address import translate_address


@@ -45,8 +44,8 @@ class ExtendedTx:
            destination = source
        if destination_value == None:
            destination_value = source_value
-        st = ERC20Token(self.chain_spec, self.rpc, add_0x(source))
-        dt = ERC20Token(self.chain_spec, self.rpc, add_0x(destination))
+        st = ERC20Token(self.chain_spec, self.rpc, source)
+        dt = ERC20Token(self.chain_spec, self.rpc, destination)
        self.source_token = source
        self.source_token_symbol = st.symbol
        self.source_token_name = st.name
--- a/apps/cic-eth/cic_eth/eth/nonce.py
+++ b/apps/cic-eth/cic_eth/eth/nonce.py
@@ -3,12 +3,11 @@ import logging

 # external imports
 import celery
-from chainlib.eth.address import is_checksum_address, is_address, strip_0x
+from chainlib.eth.address import is_checksum_address

 # local imports
 from cic_eth.db.models.role import AccountRole
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode import tx_normalize
 from cic_eth.task import CriticalSQLAlchemyTask
 from cic_eth.db.models.nonce import (
        Nonce,
@@ -43,8 +42,7 @@ class CustodialTaskNonceOracle():
        :returns: Nonce
        :rtype: number
        """
-        address = tx_normalize.wallet_address(self.address)
-        r = NonceReservation.release(address, self.uuid, session=self.session)
+        r = NonceReservation.release(self.address, self.uuid, session=self.session)
        return r[1]


@@ -60,18 +58,17 @@ def reserve_nonce(self, chained_input, chain_spec_dict, signer_address=None):
        address = chained_input
        logg.debug('non-explicit address for reserve nonce, using arg head {}'.format(chained_input))
    else:
-        if is_address(signer_address):
+        if is_checksum_address(signer_address):
            address = signer_address
            logg.debug('explicit address for reserve nonce {}'.format(signer_address))
        else:
            address = AccountRole.get_address(signer_address, session=session)
            logg.debug('role for reserve nonce {} -> {}'.format(signer_address, address))

-    if not is_address(address):
+    if not is_checksum_address(address):
        raise ValueError('invalid result when resolving address for nonce {}'.format(address))

    root_id = self.request.root_id
-    address = tx_normalize.wallet_address(address)
    r = NonceReservation.next(address, root_id, session=session)
    logg.debug('nonce {} reserved for address {} task {}'.format(r[1], address, r[0]))

--- a/apps/cic-eth/cic_eth/ext/tx.py
+++ b/apps/cic-eth/cic_eth/ext/tx.py
@@ -32,7 +32,6 @@ from potaahto.symbols import snake_and_camel
 from cic_eth.queue.time import tx_times
 from cic_eth.task import BaseTask
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app
 logg = logging.getLogger()
@@ -135,7 +134,7 @@ def list_tx_by_bloom(self, bloomspec, address, chain_spec_dict):
                    tx_address = transfer_data[0]
                    tx_token_value = transfer_data[1]
                    
-                    if tx_normalize.wallet_address(address) == tx_normalize.wallet_address(tx_address):
+                    if address == tx_address:
                        status = StatusEnum.SENT
                        try:
                            o = receipt(tx['hash'])
@@ -153,8 +152,8 @@ def list_tx_by_bloom(self, bloomspec, address, chain_spec_dict):
                        times = tx_times(tx['hash'], chain_spec)
                        tx_r = {
                            'hash': tx['hash'],
-                            'sender': tx_normalize.wallet_address(tx['from']),
-                            'recipient': tx_normalize.wallet_address(tx_address),
+                            'sender': tx['from'],
+                            'recipient': tx_address,
                            'source_value': tx_token_value,
                            'destination_value': tx_token_value,
                            'source_token': tx['to'],
@@ -165,12 +164,12 @@ def list_tx_by_bloom(self, bloomspec, address, chain_spec_dict):
                            tx_r['date_created'] = times['queue']
                        else:
                            tx_r['date_created'] = times['network']
-                        txs[strip_0x(tx['hash'])] = tx_r
+                        txs[tx['hash']] = tx_r
                        break
-
    return txs


+
 # TODO: Surely it must be possible to optimize this
 # TODO: DRY this with callback filter in cic_eth/runnable/manager
 # TODO: Remove redundant fields from end representation (timestamp, tx_hash)
@@ -231,8 +230,6 @@ def tx_collate(self, tx_batches, chain_spec_dict, offset, limit, newest_first=Tr
            except UnknownContractError:
                logg.error('verify failed on tx {}, skipping'.format(tx['hash']))
                continue
-        tx['recipient'] = tx_normalize.wallet_address(tx['recipient'])
-        tx['sender'] = tx_normalize.wallet_address(tx['sender'])
        txs.append(tx)

    return txs
--- a/apps/cic-eth/cic_eth/queue/query.py
+++ b/apps/cic-eth/cic_eth/queue/query.py
@@ -58,7 +58,6 @@ def get_tx_local(chain_spec, tx_hash, session=None):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def get_account_tx(chain_spec_dict, address, as_sender=True, as_recipient=True, counterpart=None):
-    address = tx_normalize.wallet_address(address)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    return get_account_tx_local(chain_spec, address, as_sender=as_sender, as_recipient=as_recipient, counterpart=counterpart)

--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/callback.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/callback.py
@@ -21,7 +21,6 @@ from erc20_faucet import Faucet
 # local imports
 from .base import SyncFilter
 from cic_eth.eth.meta import ExtendedTx
-from cic_eth.encode import tx_normalize

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

@@ -43,9 +42,9 @@ class CallbackFilter(SyncFilter):
            return (None, None)
        r = ERC20.parse_transfer_request(tx.payload)
        transfer_data = {}
-        transfer_data['to'] = tx_normalize.wallet_address(r[0])
+        transfer_data['to'] = r[0]
        transfer_data['value'] = r[1]
-        transfer_data['from'] = tx_normalize.wallet_address(tx.outputs[0])
+        transfer_data['from'] = tx.outputs[0]
        transfer_data['token_address'] = tx.inputs[0]
        return ('transfer', transfer_data)

@@ -55,8 +54,8 @@ class CallbackFilter(SyncFilter):
            return (None, None)
        r = ERC20.parse_transfer_from_request(tx.payload)
        transfer_data = {}
-        transfer_data['from'] = tx_normalize.wallet_address(r[0])
-        transfer_data['to'] = tx_normalize.wallet_address(r[1])
+        transfer_data['from'] = r[0]
+        transfer_data['to'] = r[1]
        transfer_data['value'] = r[2]
        transfer_data['token_address'] = tx.inputs[0]
        return ('transferfrom', transfer_data)
@@ -67,9 +66,9 @@ class CallbackFilter(SyncFilter):
            return (None, None)
        r = Faucet.parse_give_to_request(tx.payload)
        transfer_data = {}
-        transfer_data['to'] = tx_normalize.wallet_address(r[0])
+        transfer_data['to'] = r[0]
        transfer_data['value'] = tx.value
-        transfer_data['from'] = tx_normalize.wallet_address(tx.outputs[0])
+        transfer_data['from'] = tx.outputs[0]
        #transfer_data['token_address'] = tx.inputs[0]
        faucet_contract = tx.inputs[0]

--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/register.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/register.py
@@ -12,8 +12,7 @@ from hexathon import (
 # local imports
 from .base import SyncFilter

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

 account_registry_add_log_hash = '0x9cc987676e7d63379f176ea50df0ae8d2d9d1141d1231d4ce15b5965f73c9430'

--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/transferauth.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/transferauth.py
@@ -17,7 +17,6 @@ from cic_eth_registry import CICRegistry
 from erc20_transfer_authorization import TransferAuthorization

 # local imports
-from cic_eth.encode import tx_normalize
 from .base import SyncFilter


@@ -53,9 +52,9 @@ class TransferAuthFilter(SyncFilter):

        r = TransferAuthorization.parse_create_request_request(tx.payload) 
          
-        sender = tx_normalize.wallet_address(r[0])
-        recipient = tx_normalize.wallet_address(r[1])
-        token = tx_normalize.executable_address(r[2])
+        sender = r[0]
+        recipient = r[1]
+        token = r[2]
        value = r[3]

        token_data = {
--- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
@@ -72,6 +72,12 @@ from cic_eth.task import BaseTask
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

+env = list(os.environ.keys())
+env.sort()
+for k in env:
+    logg.debug("env {} {}".format(k, os.environ[k]))
+
+
 arg_flags = cic_eth.cli.argflag_std_read
 local_arg_flags = cic_eth.cli.argflag_local_task
 argparser = cic_eth.cli.ArgumentParser(arg_flags)
@@ -206,7 +212,7 @@ def main():

    BaseTask.default_token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL')
    BaseTask.default_token_address = registry.by_name(BaseTask.default_token_symbol)
-    default_token = ERC20Token(chain_spec, conn, add_0x(BaseTask.default_token_address))
+    default_token = ERC20Token(chain_spec, conn, BaseTask.default_token_address)
    default_token.load(conn)
    BaseTask.default_token_decimals = default_token.decimals
    BaseTask.default_token_name = default_token.name
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,4 +1,3 @@
 celery==4.4.7
-chainlib-eth>=0.0.9rc2,<0.1.0
+chainlib-eth>=0.0.9a11,<0.1.0
 semver==2.13.0
-crypto-dev-signer>=0.4.15rc2,<0.5.0
--- a/apps/cic-eth/services_requirements.txt
+++ b/apps/cic-eth/services_requirements.txt
@@ -8,7 +8,7 @@ pycryptodome==3.10.1
 liveness~=0.0.1a7
 eth-address-index>=0.2.3a4,<0.3.0
 eth-accounts-index>=0.1.2a3,<0.2.0
-cic-eth-registry>=0.6.1a3,<0.7.0
+cic-eth-registry>=0.6.1a2,<0.7.0
 erc20-faucet>=0.3.2a2,<0.4.0
 erc20-transfer-authorization>=0.3.5a2,<0.4.0
 sarafu-faucet>=0.0.7a2,<0.1.0
--- a/apps/cic-eth/tests/filters/test_callback_filter.py
+++ b/apps/cic-eth/tests/filters/test_callback_filter.py
@@ -18,10 +18,7 @@ from eth_erc20 import ERC20
 from sarafu_faucet import MinterFaucet
 from eth_accounts_index.registry import AccountRegistry
 from potaahto.symbols import snake_and_camel
-from hexathon import (
-        add_0x,
-        strip_0x,
-        )
+from hexathon import add_0x

 # local imports
 from cic_eth.runnable.daemons.filters.callback import CallbackFilter
@@ -163,7 +160,7 @@ def test_faucet_gift_to_tx(
    assert transfer_data['token_address'] == foo_token


-def test_callback_filter_filter(
+def test_callback_filter(
        default_chain_spec,
        init_database,
        eth_rpc,
@@ -216,7 +213,6 @@ def test_callback_filter_filter(

        def call_back(self, transfer_type, result):
            self.results[transfer_type] = result
-            logg.debug('result {}'.format(result))
            return self

    mock = CallbackMock()
@@ -225,4 +221,4 @@ def test_callback_filter_filter(
    fltr.filter(eth_rpc, mockblock, tx, init_database)

    assert mock.results.get('transfer') != None
-    assert mock.results['transfer']['destination_token'] == strip_0x(foo_token)
+    assert mock.results['transfer']['destination_token'] == foo_token
--- a/apps/cic-eth/tests/filters/test_register_filter.py
+++ b/apps/cic-eth/tests/filters/test_register_filter.py
@@ -17,9 +17,6 @@ from chainlib.eth.block import (
        block_by_number,
        Block,
        )
-from chainlib.eth.address import (
-        to_checksum_address,
-        )
 from erc20_faucet import Faucet
 from hexathon import (
        strip_0x,
@@ -28,6 +25,7 @@ from hexathon import (

 # local imports
 from cic_eth.runnable.daemons.filters.register import RegistrationFilter
+from cic_eth.encode import tx_normalize
 from cic_eth.queue.query import get_account_tx_local

 logg = logging.getLogger()
@@ -72,13 +70,12 @@ def test_register_filter(
    tx = Tx(tx_src, block=block, rcpt=rcpt)
    tx.apply_receipt(rcpt)

-    fltr = RegistrationFilter(default_chain_spec, to_checksum_address(os.urandom(20).hex()), queue=None)
+    fltr = RegistrationFilter(default_chain_spec, add_0x(os.urandom(20).hex()), queue=None)
    t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
    assert t == None

-    fltr = RegistrationFilter(default_chain_spec, to_checksum_address(account_registry), queue=None)
+    fltr = RegistrationFilter(default_chain_spec, account_registry, queue=None)
    t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
-    logg.debug('t {}'.format(t))

    t.get_leaf()
    assert t.successful()
@@ -92,4 +89,4 @@ def test_register_filter(
    gift_tx = unpack(tx_raw_signed_bytes, default_chain_spec)

    gift = Faucet.parse_give_to_request(gift_tx['data'])
-    assert add_0x(gift[0]) == agent_roles['ALICE']
+    assert gift[0] == agent_roles['ALICE']
--- a/apps/cic-eth/tests/filters/test_transferauth_filter.py
+++ b/apps/cic-eth/tests/filters/test_transferauth_filter.py
@@ -19,7 +19,6 @@ from chainqueue.sql.query import get_account_tx

 # local imports
 from cic_eth.runnable.daemons.filters.transferauth import TransferAuthFilter
-from cic_eth.encode import tx_normalize


 def test_filter_transferauth(
@@ -67,8 +66,7 @@ def test_filter_transferauth(
    t.get_leaf()
    assert t.successful()

-    #approve_txs = get_account_tx(default_chain_spec.asdict(), agent_roles['ALICE'], as_sender=True, session=init_database)
-    approve_txs = get_account_tx(default_chain_spec.asdict(), tx_normalize.wallet_address(agent_roles['ALICE']), as_sender=True, session=init_database)
+    approve_txs = get_account_tx(default_chain_spec.asdict(), agent_roles['ALICE'], as_sender=True, session=init_database)
    ks = list(approve_txs.keys())
    assert len(ks) == 1

@@ -78,4 +76,4 @@ def test_filter_transferauth(

    c = ERC20(default_chain_spec)
    approve = c.parse_approve_request(approve_tx['data']) 
-    assert approve[0] == strip_0x(agent_roles['BOB'])
+    assert approve[0] == agent_roles['BOB']
--- a/apps/cic-eth/tests/task/api/test_admin.py
+++ b/apps/cic-eth/tests/task/api/test_admin.py
@@ -110,8 +110,8 @@ def test_tag_account(
    t = api.tag_account('bar', agent_roles['CAROL'], default_chain_spec)
    t.get()

-    assert AccountRole.get_address('foo', init_database) == tx_normalize.wallet_address(agent_roles['ALICE'])
-    assert AccountRole.get_address('bar', init_database) == tx_normalize.wallet_address(agent_roles['CAROL'])
+    assert AccountRole.get_address('foo', init_database) == agent_roles['ALICE']
+    assert AccountRole.get_address('bar', init_database) == agent_roles['CAROL']


 def test_tx(
--- a/apps/cic-eth/tests/task/api/test_app.py
+++ b/apps/cic-eth/tests/task/api/test_app.py
@@ -10,7 +10,6 @@ from cic_eth_registry.erc20 import ERC20Token
 from chainlib.chain import ChainSpec
 from eth_accounts_index import AccountsIndex
 from chainlib.eth.tx import (
-        receipt,
        transaction,
        )
 from chainqueue.sql.state import (
@@ -30,7 +29,6 @@ def test_account_api(
        init_database,
        init_eth_rpc,
        account_registry,
-        cic_registry,
        custodial_roles,
        celery_session_worker,
        ):
@@ -51,7 +49,6 @@ def test_account_api_register(
        eth_rpc,
        celery_session_worker,
        ):
-
    api = Api(str(default_chain_spec), callback_param='accounts', callback_task='cic_eth.callbacks.noop.noop', queue=None)
    t = api.create_account('')
    register_tx_hash = t.get_leaf()
@@ -72,18 +69,12 @@ def test_account_api_register(
    r = t.get_leaf()
    assert t.successful()

-    o = receipt(register_tx_hash)
-    r = eth_rpc.do(o)
-    assert r['status'] == 1
-
    o = transaction(register_tx_hash)
    tx_src = eth_rpc.do(o)

    c = AccountsIndex(default_chain_spec)
    address = c.parse_add_request(tx_src['data'])
-    logg.debug('address {} '.format(address))
    o = c.have(account_registry, address[0], sender_address=custodial_roles['CONTRACT_DEPLOYER'])
-    logg.debug('o {}'.format(o))
    r = eth_rpc.do(o)
    assert c.parse_have(r)

--- a/apps/cic-eth/tests/task/api/test_balance.py
+++ b/apps/cic-eth/tests/task/api/test_balance.py
@@ -3,22 +3,18 @@ import os
 import logging

 # external imports
-import pytest
 from chainlib.eth.address import to_checksum_address
-from hexathon import add_0x

 # local imports
 from cic_eth.api.api_task import Api

 logg = logging.getLogger()

-
 def test_balance_simple_api(
        default_chain_spec,
        init_database,
        cic_registry,
        foo_token,
-        register_lookups,
        register_tokens,
        api,
        celery_session_worker,
@@ -26,7 +22,7 @@ def test_balance_simple_api(

    chain_str = str(default_chain_spec)

-    a = add_0x(to_checksum_address(os.urandom(20).hex()))
+    a = to_checksum_address('0x' + os.urandom(20).hex())
    t = api.balance(a, 'FOO', include_pending=False)
    r = t.get_leaf()
    assert t.successful()
@@ -40,7 +36,6 @@ def test_balance_complex_api(
        init_database,
        cic_registry,
        foo_token,
-        register_lookups,
        register_tokens,
        api,
        celery_session_worker,
@@ -48,7 +43,7 @@ def test_balance_complex_api(

    chain_str = str(default_chain_spec)

-    a = add_0x(to_checksum_address(os.urandom(20).hex()))
+    a = to_checksum_address('0x' + os.urandom(20).hex())
    t = api.balance(a, 'FOO', include_pending=True)
    r = t.get_leaf()
    assert t.successful()
--- a/apps/cic-eth/tests/task/api/test_list.py
+++ b/apps/cic-eth/tests/task/api/test_list.py
@@ -6,7 +6,6 @@ import pytest
 from chainlib.eth.nonce import RPCNonceOracle
 from eth_erc20 import ERC20
 from chainlib.eth.tx import receipt
-from hexathon import strip_0x

 # local imports
 from cic_eth.api.api_task import Api
@@ -24,6 +23,7 @@ from cic_eth.pytest.mock.filter import (
 logg = logging.getLogger()


+@pytest.mark.xfail()
 def test_list_tx(
        default_chain_spec,
        init_database,
@@ -34,10 +34,8 @@ def test_list_tx(
        agent_roles,
        foo_token,
        register_tokens,
-        register_lookups,
        init_eth_tester,
        celery_session_worker,
-        init_celery_tasks,
        ):

    tx_hashes = []
@@ -65,16 +63,13 @@ def test_list_tx(
    o = receipt(tx_hash_hex)
    r = eth_rpc.do(o)
    assert r['status'] == 1
-
    a = r['block_number']
-    ab = a.to_bytes(4, 'big')
-    block_filter.add(ab)
+    block_filter.add(a.to_bytes(4, 'big'))

-    bb = r['transaction_index'].to_bytes(4, 'big')
-    cb = ab + bb
-    tx_filter.add(cb)
+    a = r['block_number'] + r['transaction_index']
+    tx_filter.add(a.to_bytes(4, 'big'))

-    tx_hashes.append(strip_0x(tx_hash_hex))
+    tx_hashes.append(tx_hash_hex)

    # external tx two
    Nonce.next(agent_roles['ALICE'], 'foo', session=init_database)
@@ -88,29 +83,26 @@ def test_list_tx(
    o = receipt(tx_hash_hex)
    r = eth_rpc.do(o)
    assert r['status'] == 1
-
    a = r['block_number']
-    ab = a.to_bytes(4, 'big')
-    block_filter.add(ab)
+    block_filter.add(a.to_bytes(4, 'big'))

-    bb = r['transaction_index'].to_bytes(4, 'big')
-    cb = ab + bb
-    tx_filter.add(cb)
+    a = r['block_number'] + r['transaction_index']
+    tx_filter.add(a.to_bytes(4, 'big'))

-    tx_hashes.append(strip_0x(tx_hash_hex))
+    tx_hashes.append(tx_hash_hex)

    init_eth_tester.mine_blocks(28)

    # custodial tx 1
    api = Api(str(default_chain_spec), queue=None)
-    t = api.transfer(agent_roles['ALICE'], agent_roles['CAROL'], 64, 'FOO')
+    t = api.transfer(agent_roles['ALICE'], agent_roles['CAROL'], 64, 'FOO') #, 'blinky')
    r = t.get_leaf()
    assert t.successful()
    tx_hashes.append(r)

    # custodial tx 2
    api = Api(str(default_chain_spec), queue=None)
-    t = api.transfer(agent_roles['ALICE'], agent_roles['DAVE'], 16, 'FOO')
+    t = api.transfer(agent_roles['ALICE'], agent_roles['DAVE'], 16, 'FOO') #, 'blinky')
    r = t.get_leaf()
    assert t.successful()
    tx_hashes.append(r)
@@ -125,8 +117,7 @@ def test_list_tx(
    assert len(r) == 3
    logg.debug('rrrr {}'.format(r))

-    logg.debug('testing against hashes {}'.format(tx_hashes))
    for tx in r:
        logg.debug('have tx {}'.format(tx))
-        tx_hashes.remove(strip_0x(tx['hash']))
+        tx_hashes.remove(tx['hash'])
    assert len(tx_hashes) == 1
--- a/apps/cic-eth/tests/task/test_ext_tx.py
+++ b/apps/cic-eth/tests/task/test_ext_tx.py
@@ -10,7 +10,6 @@ from chainlib.eth.tx import (
        )
 from eth_erc20 import ERC20
 from chainlib.eth.nonce import RPCNonceOracle
-from hexathon import add_0x 

 # local imports
 from cic_eth.db.models.nonce import (
@@ -92,5 +91,5 @@ def test_filter_process(

    assert len(r) == 2
    for tx_hash in r.keys():
-        tx_hashes.remove(add_0x(tx_hash))
+        tx_hashes.remove(tx_hash)
    assert len(tx_hashes) == 0
--- a/apps/cic-eth/tools_requirements.txt
+++ b/apps/cic-eth/tools_requirements.txt
@@ -1,6 +1,6 @@
-crypto-dev-signer>=0.4.15a7,<=0.4.15
+crypto-dev-signer>=0.4.15a4,<=0.4.15
 chainqueue>=0.0.5a1,<0.1.0
-cic-eth-registry>=0.6.1a3,<0.7.0
+cic-eth-registry>=0.6.1a2,<0.7.0
 redis==3.5.3
 hexathon~=0.0.1a8
 pycryptodome==3.10.1
--- a/apps/cic-meta/docker/Dockerfile
+++ b/apps/cic-meta/docker/Dockerfile
@@ -8,7 +8,7 @@ RUN apk add --no-cache postgresql bash

 # copy the dependencies
 COPY package.json package-lock.json .
-RUN --mount=type=cache,id=meta,mode=0755,target=/root/.npm \
+RUN --mount=type=cache,mode=0755,target=/root/.npm \
    npm set cache /root/.npm && \
    npm ci

--- a/apps/cic-ussd/cic_ussd/account/balance.py
+++ b/apps/cic-ussd/cic_ussd/account/balance.py
@@ -1,12 +1,10 @@
 # standard imports
-
 import json
 import logging
 from typing import Optional

 # third-party imports
 from cic_eth.api import Api
-from cic_eth_aux.erc20_demurrage_token.api import Api as DemurrageApi

 # local imports
 from cic_ussd.account.transaction import from_wei
@@ -75,24 +73,6 @@ def calculate_available_balance(balances: dict) -> float:
    return from_wei(value=available_balance)


-def get_adjusted_balance(balance: int, chain_str: str, timestamp: int, token_symbol: str):
-    """
-    :param balance:
-    :type balance:
-    :param chain_str:
-    :type chain_str:
-    :param timestamp:
-    :type timestamp:
-    :param token_symbol:
-    :type token_symbol:
-    :return:
-    :rtype:
-    """
-    logg.debug(f'retrieving adjusted balance on chain: {chain_str}')
-    demurrage_api = DemurrageApi(chain_str=chain_str)
-    return demurrage_api.get_adjusted_balance(token_symbol, balance, timestamp).result
-
-
 def get_cached_available_balance(blockchain_address: str) -> float:
    """This function attempts to retrieve balance data from the redis cache.
    :param blockchain_address: Ethereum address of an account.
@@ -101,21 +81,10 @@ def get_cached_available_balance(blockchain_address: str) -> float:
    :return: Operational balance of an account.
    :rtype: float
    """
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(blockchain_address[2:])
    key = cache_data_key(identifier, salt=':cic.balances')
    cached_balances = get_cached_data(key=key)
    if cached_balances:
        return calculate_available_balance(json.loads(cached_balances))
    else:
        raise CachedDataNotFoundError(f'No cached available balance for address: {blockchain_address}')
-
-
-def get_cached_adjusted_balance(identifier: bytes):
-    """
-    :param identifier:
-    :type identifier:
-    :return:
-    :rtype:
-    """
-    key = cache_data_key(identifier, ':cic.adjusted_balance')
-    return get_cached_data(key)
--- a/apps/cic-ussd/cic_ussd/account/metadata.py
+++ b/apps/cic-ussd/cic_ussd/account/metadata.py
@@ -4,6 +4,7 @@ import logging
 from typing import Optional

 # external imports
+from chainlib.hash import strip_0x
 from cic_types.models.person import Person

 # local imports
@@ -19,7 +20,7 @@ def get_cached_preferred_language(blockchain_address: str) -> Optional[str]:
    :return: Account's set preferred language | Fallback preferred language.
    :rtype: str
    """
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(strip_0x(blockchain_address))
    preferences_metadata_handler = PreferencesMetadata(identifier)
    cached_preferences_metadata = preferences_metadata_handler.get_cached_metadata()
    if cached_preferences_metadata:
--- a/apps/cic-ussd/cic_ussd/account/statement.py
+++ b/apps/cic-ussd/cic_ussd/account/statement.py
@@ -86,7 +86,7 @@ def query_statement(blockchain_address: str, limit: int = 9):
    :param limit: Number of transactions to be returned.
    :type limit: int
    """
-    logg.debug(f'retrieving statement for address: {blockchain_address}')
+    logg.debug(f'retrieving balance for address: {blockchain_address}')
    chain_str = Chain.spec.__str__()
    cic_eth_api = Api(
        chain_str=chain_str,
--- a/apps/cic-ussd/cic_ussd/db/models/account.py
+++ b/apps/cic-ussd/cic_ussd/db/models/account.py
@@ -2,6 +2,7 @@
 import json

 # external imports
+from chainlib.hash import strip_0x
 from cic_eth.api import Api

 # local imports
@@ -100,7 +101,7 @@ class Account(SessionBase):
        session.add(self)
        session.flush()
        SessionBase.release_session(session=session)
-        return 'Pin reset successful.'
+        return f'Pin reset successful.'

    def standard_metadata_id(self) -> str:
        """This function creates an account's standard metadata identification information that contains an account owner's
@@ -108,7 +109,7 @@ class Account(SessionBase):
        :return: Standard metadata identification information | e164 formatted phone number.
        :rtype: str
        """
-        identifier = bytes.fromhex(self.blockchain_address)
+        identifier = bytes.fromhex(strip_0x(self.blockchain_address))
        key = cache_data_key(identifier, ':cic.person')
        account_metadata = get_cached_data(key)
        if not account_metadata:
--- a/apps/cic-ussd/cic_ussd/processor/menu.py
+++ b/apps/cic-ussd/cic_ussd/processor/menu.py
@@ -1,17 +1,13 @@
 # standard imports
 import json
 import logging
-from datetime import datetime, timedelta

 # external imports
 import i18n.config
+from sqlalchemy.orm.session import Session

 # local imports
-from cic_ussd.account.balance import (calculate_available_balance,
-                                      get_adjusted_balance,
-                                      get_balances,
-                                      get_cached_adjusted_balance,
-                                      get_cached_available_balance)
+from cic_ussd.account.balance import calculate_available_balance, get_balances, get_cached_available_balance
 from cic_ussd.account.chain import Chain
 from cic_ussd.account.metadata import get_cached_preferred_language
 from cic_ussd.account.statement import (
@@ -20,15 +16,14 @@ from cic_ussd.account.statement import (
    query_statement,
    statement_transaction_set
 )
-from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.account.transaction import from_wei, to_wei
+from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.cache import cache_data_key, cache_data
 from cic_ussd.db.models.account import Account
 from cic_ussd.metadata import PersonMetadata
 from cic_ussd.phone_number import Support
-from cic_ussd.processor.util import parse_person_metadata
+from cic_ussd.processor.util import latest_input, parse_person_metadata
 from cic_ussd.translation import translation_for
-from sqlalchemy.orm.session import Session

 logg = logging.getLogger(__name__)

@@ -37,7 +32,7 @@ class MenuProcessor:
    def __init__(self, account: Account, display_key: str, menu_name: str, session: Session, ussd_session: dict):
        self.account = account
        self.display_key = display_key
-        self.identifier = bytes.fromhex(self.account.blockchain_address)
+        self.identifier = bytes.fromhex(self.account.blockchain_address[2:])
        self.menu_name = menu_name
        self.session = session
        self.ussd_session = ussd_session
@@ -48,26 +43,21 @@ class MenuProcessor:
        :rtype:
        """
        available_balance = get_cached_available_balance(self.account.blockchain_address)
-        adjusted_balance = get_cached_adjusted_balance(self.identifier)
+        logg.debug('Requires call to retrieve tax and bonus amounts')
+        tax = ''
+        bonus = ''
        token_symbol = get_default_token_symbol()
        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
        if not preferred_language:
            preferred_language = i18n.config.get('fallback')
-        with_available_balance = f'{self.display_key}.available_balance'
-        with_fees = f'{self.display_key}.with_fees'
-        if not adjusted_balance:
-            return translation_for(key=with_available_balance,
-                                   preferred_language=preferred_language,
-                                   available_balance=available_balance,
-                                   token_symbol=token_symbol)
-        adjusted_balance = json.loads(adjusted_balance)
-        tax_wei = to_wei(int(available_balance)) - int(adjusted_balance)
-        tax = from_wei(int(tax_wei))
-        return translation_for(key=with_fees,
-                               preferred_language=preferred_language,
-                               available_balance=available_balance,
-                               tax=tax,
-                               token_symbol=token_symbol)
+        return translation_for(
+            key=self.display_key,
+            preferred_language=preferred_language,
+            available_balance=available_balance,
+            tax=tax,
+            bonus=bonus,
+            token_symbol=token_symbol
+        )

    def account_statement(self) -> str:
        """
@@ -77,7 +67,7 @@ class MenuProcessor:
        cached_statement = get_cached_statement(self.account.blockchain_address)
        statement = json.loads(cached_statement)
        statement_transactions = parse_statement_transactions(statement)
-        transaction_sets = [statement_transactions[tx:tx + 3] for tx in range(0, len(statement_transactions), 3)]
+        transaction_sets = [statement_transactions[tx:tx+3] for tx in range(0, len(statement_transactions), 3)]
        preferred_language = get_cached_preferred_language(self.account.blockchain_address)
        if not preferred_language:
            preferred_language = i18n.config.get('fallback')
@@ -159,22 +149,12 @@ class MenuProcessor:
        :return:
        :rtype:
        """
-        chain_str = Chain.spec.__str__()
        token_symbol = get_default_token_symbol()
        blockchain_address = self.account.blockchain_address
-        balances = get_balances(blockchain_address, chain_str, token_symbol, False)[0]
+        balances = get_balances(blockchain_address, Chain.spec.__str__(), token_symbol, False)[0]
        key = cache_data_key(self.identifier, ':cic.balances')
        cache_data(key, json.dumps(balances))
        available_balance = calculate_available_balance(balances)
-        now = datetime.now()
-        if (now - self.account.created).days >= 30:
-            if available_balance <= 0:
-                logg.info(f'Not retrieving adjusted balance, available balance: {available_balance} is insufficient.')
-            else:
-                timestamp = int((now - timedelta(30)).timestamp())
-                adjusted_balance = get_adjusted_balance(to_wei(int(available_balance)), chain_str, timestamp, token_symbol)
-                key = cache_data_key(self.identifier, ':cic.adjusted_balance')
-                cache_data(key, json.dumps(adjusted_balance))

        query_statement(blockchain_address)

--- a/apps/cic-ussd/cic_ussd/runnable/client.py
+++ b/apps/cic-ussd/cic_ussd/runnable/client.py
@@ -63,7 +63,7 @@ elif ssl == 0:
 else:
    ssl = True

-valid_service_codes = config.get('USSD_SERVICE_CODE').split(",")
+
 def main():

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

    state = "_BEGIN"
--- a/apps/cic-ussd/cic_ussd/state_machine/logic/account.py
+++ b/apps/cic-ussd/cic_ussd/state_machine/logic/account.py
@@ -154,14 +154,15 @@ def parse_person_metadata(account: Account, metadata: dict):
    phone_number = account.phone_number
    date_registered = int(account.created.replace().timestamp())
    blockchain_address = account.blockchain_address
-    chain_str = Chain.spec.__str__()
+    chain_spec = f'{Chain.spec.common_name()}:{Chain.spec.engine()}: {Chain.spec.chain_id()}'

    if isinstance(metadata.get('identities'), dict):
        identities = metadata.get('identities')
    else:
        identities = manage_identity_data(
            blockchain_address=blockchain_address,
-            chain_str=chain_str
+            blockchain_type=Chain.spec.engine(),
+            chain_spec=chain_spec
        )

    return {
--- a/apps/cic-ussd/cic_ussd/tasks/callback_handler.py
+++ b/apps/cic-ussd/cic_ussd/tasks/callback_handler.py
@@ -5,6 +5,7 @@ from datetime import timedelta

 # third-party imports
 import celery
+from chainlib.hash import strip_0x

 # local imports
 from cic_ussd.account.balance import get_balances, calculate_available_balance
@@ -54,7 +55,6 @@ def account_creation_callback(self, result: str, url: str, status_code: int):
    session.add(account)
    session.commit()
    session.close()
-    logg.debug(f'recorded account with identifier: {result}')

    queue = self.request.delivery_info.get('routing_key')
    s_phone_pointer = celery.signature(
@@ -86,7 +86,7 @@ def balances_callback(result: list, param: str, status_code: int):
        raise ValueError(f'Unexpected status code: {status_code}.')

    balances = result[0]
-    identifier = bytes.fromhex(param)
+    identifier = bytes.fromhex(strip_0x(param))
    key = cache_data_key(identifier, ':cic.balances')
    cache_data(key, json.dumps(balances))

@@ -113,10 +113,8 @@ def statement_callback(self, result, param: str, status_code: int):
    for transaction in statement_transactions:
        recipient_transaction, sender_transaction = transaction_actors(transaction)
        if recipient_transaction.get('blockchain_address') == param:
-            recipient_transaction['alt_blockchain_address'] = sender_transaction.get('blockchain_address')
            generate(param, queue, recipient_transaction)
        if sender_transaction.get('blockchain_address') == param:
-            sender_transaction['alt_blockchain_address'] = recipient_transaction.get('blockchain_address')
            generate(param, queue, sender_transaction)


--- a/apps/cic-ussd/cic_ussd/tasks/metadata.py
+++ b/apps/cic-ussd/cic_ussd/tasks/metadata.py
@@ -3,6 +3,7 @@ import logging

 # third-party imports
 import celery
+from hexathon import strip_0x

 # local imports
 from cic_ussd.metadata import CustomMetadata, PersonMetadata, PhonePointerMetadata, PreferencesMetadata
@@ -20,7 +21,7 @@ def query_person_metadata(blockchain_address: str):
    :return:
    :rtype:
    """
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(strip_0x(blockchain_address))
    person_metadata_client = PersonMetadata(identifier=identifier)
    person_metadata_client.query()

@@ -35,14 +36,14 @@ def create_person_metadata(blockchain_address: str, data: dict):
    :return:
    :rtype:
    """
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(strip_0x(blockchain_address))
    person_metadata_client = PersonMetadata(identifier=identifier)
    person_metadata_client.create(data=data)


@celery_app.task
 def edit_person_metadata(blockchain_address: str, data: dict):
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(strip_0x(blockchain_address))
    person_metadata_client = PersonMetadata(identifier=identifier)
    person_metadata_client.edit(data=data)

@@ -50,21 +51,21 @@ def edit_person_metadata(blockchain_address: str, data: dict):
@celery_app.task(bind=True, base=CriticalMetadataTask)
 def add_phone_pointer(self, blockchain_address: str, phone_number: str):
    identifier = phone_number.encode('utf-8')
-    stripped_address = blockchain_address
+    stripped_address = strip_0x(blockchain_address)
    phone_metadata_client = PhonePointerMetadata(identifier=identifier)
    phone_metadata_client.create(data=stripped_address)


@celery_app.task()
 def add_custom_metadata(blockchain_address: str, data: dict):
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(strip_0x(blockchain_address))
    custom_metadata_client = CustomMetadata(identifier=identifier)
    custom_metadata_client.create(data=data)


@celery_app.task()
 def add_preferences_metadata(blockchain_address: str, data: dict):
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(strip_0x(blockchain_address))
    preferences_metadata_client = PreferencesMetadata(identifier=identifier)
    preferences_metadata_client.create(data=data)

@@ -75,7 +76,7 @@ def query_preferences_metadata(blockchain_address: str):
    :param blockchain_address: Blockchain address of an account.
    :type blockchain_address: str | Ox-hex
    """
-    identifier = bytes.fromhex(blockchain_address)
+    identifier = bytes.fromhex(strip_0x(blockchain_address))
    logg.debug(f'Retrieving preferences metadata for address: {blockchain_address}.')
    person_metadata_client = PreferencesMetadata(identifier=identifier)
    return person_metadata_client.query()
--- a/apps/cic-ussd/cic_ussd/tasks/notifications.py
+++ b/apps/cic-ussd/cic_ussd/tasks/notifications.py
@@ -24,8 +24,7 @@ def transaction(notification_data: dict):
    :rtype:
    """
    role = notification_data.get('role')
-    token_value = notification_data.get('token_value')
-    amount = token_value if token_value == 0 else from_wei(token_value)
+    amount = from_wei(notification_data.get('token_value'))
    balance = notification_data.get('available_balance')
    phone_number = notification_data.get('phone_number')
    preferred_language = notification_data.get('preferred_language')
--- a/apps/cic-ussd/cic_ussd/tasks/processor.py
+++ b/apps/cic-ussd/cic_ussd/tasks/processor.py
@@ -5,6 +5,7 @@ import logging
 # third-party imports
 import celery
 import i18n
+from chainlib.hash import strip_0x

 # local imports
 from cic_ussd.account.metadata import get_cached_preferred_language
@@ -23,13 +24,17 @@ logg = logging.getLogger(__file__)
 def generate_statement(self, querying_party: str, transaction: dict):
    """"""
    queue = self.request.delivery_info.get('routing_key')
+
+    s_preferences = celery.signature(
+        'cic_ussd.tasks.metadata.query_preferences_metadata', [querying_party], queue=queue
+    )
    s_parse_transaction = celery.signature(
        'cic_ussd.tasks.processor.parse_transaction', [transaction], queue=queue
    )
    s_cache_statement = celery.signature(
        'cic_ussd.tasks.processor.cache_statement', [querying_party], queue=queue
    )
-    celery.chain(s_parse_transaction, s_cache_statement).apply_async()
+    celery.chain(s_preferences, s_parse_transaction, s_cache_statement).apply_async()


@celery_app.task
@@ -48,7 +53,7 @@ def cache_statement(parsed_transaction: dict, querying_party: str):
        statement_transactions = json.loads(cached_statement)
    statement_transactions.append(parsed_transaction)
    data = json.dumps(statement_transactions)
-    identifier = bytes.fromhex(querying_party)
+    identifier = bytes.fromhex(strip_0x(querying_party))
    key = cache_data_key(identifier, ':cic.statement')
    cache_data(key, data)

--- a/apps/cic-ussd/cic_ussd/version.py
+++ b/apps/cic-ussd/cic_ussd/version.py
@@ -1,7 +1,7 @@
 # standard imports
 import semver

-version = (0, 3, 1, 'alpha.5')
+version = (0, 3, 1, 'alpha.4')

 version_object = semver.VersionInfo(
        major=version[0],
--- a/apps/cic-ussd/config/client/app.ini
+++ b/apps/cic-ussd/config/client/app.ini
@@ -0,0 +1,2 @@
+[app]
+service_code = *483*46#
--- a/apps/cic-ussd/config/client/ussd.ini
+++ b/apps/cic-ussd/config/client/ussd.ini
@@ -1,4 +1,3 @@
 [ussd]
-service_code = *483*46#
 user =
 pass =
--- a/apps/cic-ussd/docker/Dockerfile
+++ b/apps/cic-ussd/docker/Dockerfile
@@ -10,13 +10,6 @@ RUN mkdir -vp data

 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url https://pypi.org/simple  \
-	  --extra-index-url $GITLAB_PYTHON_REGISTRY \
-    --extra-index-url $EXTRA_INDEX_URL \
-    cic-eth-aux-erc20-demurrage-token~=0.0.2a6
-
 COPY requirements.txt .

 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -1,12 +1,9 @@
 alembic==1.4.2
-attrs==21.2.0
-billiard==3.6.4.0
 bcrypt==3.2.0
 celery==4.4.7
-cffi==1.14.6
 cic-eth[services]~=0.12.4a7
 cic-notify~=0.4.0a10
-cic-types~=0.1.0a15
+cic-types~=0.1.0a14
 confini>=0.4.1a1,<0.5.0
 phonenumbers==8.12.12
 psycopg2==2.8.6
--- a/apps/cic-ussd/tests/cic_ussd/account/test_balance.py
+++ b/apps/cic-ussd/tests/cic_ussd/account/test_balance.py
@@ -43,13 +43,10 @@ def test_sync_get_balances(activated_account,
    (5000000, 89000000, 67000000, 27.00)
 ])
 def test_calculate_available_balance(activated_account,
-                                     available_balance,
                                     balance_incoming,
                                     balance_network,
                                     balance_outgoing,
-                                     cache_balances,
-                                     cache_default_token_data,
-                                     load_chain_spec):
+                                     available_balance):
    balances = {
        'address': activated_account.blockchain_address,
        'converters': [],
@@ -60,11 +57,7 @@ def test_calculate_available_balance(activated_account,
    assert calculate_available_balance(balances) == available_balance


-def test_get_cached_available_balance(activated_account,
-                                      balances,
-                                      cache_balances,
-                                      cache_default_token_data,
-                                      load_chain_spec):
+def test_get_cached_available_balance(activated_account, cache_balances, balances):
    cached_available_balance = get_cached_available_balance(activated_account.blockchain_address)
    available_balance = calculate_available_balance(balances[0])
    assert cached_available_balance == available_balance
--- a/apps/cic-ussd/tests/cic_ussd/account/test_statement.py
+++ b/apps/cic-ussd/tests/cic_ussd/account/test_statement.py
@@ -27,7 +27,6 @@ def test_filter_statement_transactions(transactions_list):


 def test_generate(activated_account,
-                  cache_default_token_data,
                  cache_preferences,
                  celery_session_worker,
                  init_cache,
@@ -36,22 +35,22 @@ def test_generate(activated_account,
                  preferences,
                  preferences_metadata_url,
                  transactions_list):
-    statement_transactions = filter_statement_transactions(transactions_list)
-    for transaction in statement_transactions:
-        querying_party = activated_account.blockchain_address
-        recipient_transaction, sender_transaction = transaction_actors(transaction)
-        if recipient_transaction.get('blockchain_address') == querying_party:
-            recipient_transaction['alt_blockchain_address'] = sender_transaction.get('blockchain_address')
-            generate(querying_party, None, recipient_transaction)
-        if sender_transaction.get('blockchain_address') == querying_party:
-            sender_transaction['alt_blockchain_address'] = recipient_transaction.get('blockchain_address')
-            generate(querying_party, None, sender_transaction)
-    time.sleep(2)
-    identifier = bytes.fromhex(activated_account.blockchain_address)
-    key = cache_data_key(identifier, ':cic.statement')
-    statement = get_cached_data(key)
-    statement = json.loads(statement)
-    assert len(statement) == 1
+    with requests_mock.Mocker(real_http=False) as request_mocker:
+        request_mocker.register_uri('GET', preferences_metadata_url, status_code=200, reason='OK', json=preferences)
+        statement_transactions = filter_statement_transactions(transactions_list)
+        for transaction in statement_transactions:
+            querying_party = activated_account.blockchain_address
+            recipient_transaction, sender_transaction = transaction_actors(transaction)
+            if recipient_transaction.get('blockchain_address') == querying_party:
+                generate(querying_party, None, recipient_transaction)
+            if sender_transaction.get('blockchain_address') == querying_party:
+                generate(querying_party, None, sender_transaction)
+        time.sleep(2)
+        identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
+        key = cache_data_key(identifier, ':cic.statement')
+        statement = get_cached_data(key)
+        statement = json.loads(statement)
+        assert len(statement) == 1


 def test_get_cached_statement(activated_account, cache_statement, statement):
@@ -61,7 +60,7 @@ def test_get_cached_statement(activated_account, cache_statement, statement):
    assert cached_statement[0].get('blockchain_address') == statement[0].get('blockchain_address')


-def test_parse_statement_transactions(cache_default_token_data, statement):
+def test_parse_statement_transactions(statement):
    parsed_transactions = parse_statement_transactions(statement)
    parsed_transaction = parsed_transactions[0]
    parsed_transaction.startswith('Sent')
@@ -77,7 +76,7 @@ def test_query_statement(blockchain_address, limit, load_chain_spec, activated_a
    assert mock_transaction_list_query.get('limit') == limit


-def test_statement_transaction_set(cache_default_token_data, load_chain_spec, preferences, set_locale_files, statement):
+def test_statement_transaction_set(preferences, set_locale_files, statement):
    parsed_transactions = parse_statement_transactions(statement)
    preferred_language = preferences.get('preferred_language')
    transaction_set = statement_transaction_set(preferred_language, parsed_transactions)
--- a/apps/cic-ussd/tests/cic_ussd/account/test_transaction.py
+++ b/apps/cic-ussd/tests/cic_ussd/account/test_transaction.py
@@ -36,19 +36,19 @@ def test_aux_transaction_data(preferences, set_locale_files, transactions_list):
    check_aux_data('helpers.sent', 'helpers.to', preferred_language, sender_tx_aux_data)


-@pytest.mark.parametrize("value, expected_result", [
+@pytest.mark.parametrize("wei, expected_result", [
    (50000000, Decimal('50.00')),
    (100000, Decimal('0.10'))
 ])
-def test_from_wei(cache_default_token_data, expected_result, value):
-    assert from_wei(value) == expected_result
+def test_from_wei(wei, expected_result):
+    assert from_wei(wei) == expected_result


@pytest.mark.parametrize("value, expected_result", [
    (50, 50000000),
    (0.10, 100000)
 ])
-def test_to_wei(cache_default_token_data, expected_result, value):
+def test_to_wei(value, expected_result):
    assert to_wei(value) == expected_result


@@ -96,7 +96,6 @@ def test_validate_transaction_account(activated_account, init_database, transact
@pytest.mark.parametrize("amount", [50, 0.10])
 def test_outgoing_transaction_processor(activated_account,
                                        amount,
-                                        cache_default_token_data,
                                        celery_session_worker,
                                        load_config,
                                        load_chain_spec,
--- a/apps/cic-ussd/tests/cic_ussd/processor/test_menu.py
+++ b/apps/cic-ussd/tests/cic_ussd/processor/test_menu.py
@@ -1,6 +1,5 @@
 # standard imports
 import json
-import datetime

 # external imports
 from chainlib.hash import strip_0x
@@ -15,7 +14,6 @@ from cic_ussd.account.statement import (
 )
 from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.account.transaction import from_wei, to_wei
-from cic_ussd.cache import cache_data, cache_data_key
 from cic_ussd.menu.ussd_menu import UssdMenu
 from cic_ussd.metadata import PersonMetadata
 from cic_ussd.phone_number import Support
@@ -40,34 +38,24 @@ def test_menu_processor(activated_account,
                        load_chain_spec,
                        load_support_phone,
                        load_ussd_menu,
-                        mock_get_adjusted_balance,
                        mock_sync_balance_api_query,
                        mock_transaction_list_query,
                        valid_recipient):
    preferred_language = get_cached_preferred_language(activated_account.blockchain_address)
    available_balance = get_cached_available_balance(activated_account.blockchain_address)
    token_symbol = get_default_token_symbol()
-    with_available_balance = 'ussd.kenya.account_balances.available_balance'
-    with_fees = 'ussd.kenya.account_balances.with_fees'
+
+    tax = ''
+    bonus = ''
+    display_key = 'ussd.kenya.account_balances'
    ussd_menu = UssdMenu.find_by_name('account_balances')
    name = ussd_menu.get('name')
-    resp = response(activated_account, 'ussd.kenya.account_balances', name, init_database, generic_ussd_session)
-    assert resp == translation_for(with_available_balance,
+    resp = response(activated_account, display_key, name, init_database, generic_ussd_session)
+    assert resp == translation_for(display_key,
                                   preferred_language,
                                   available_balance=available_balance,
-                                   token_symbol=token_symbol)
-
-    identifier = bytes.fromhex(activated_account.blockchain_address)
-    key = cache_data_key(identifier, ':cic.adjusted_balance')
-    adjusted_balance = 45931650.64654012
-    cache_data(key, json.dumps(adjusted_balance))
-    resp = response(activated_account, 'ussd.kenya.account_balances', name, init_database, generic_ussd_session)
-    tax_wei = to_wei(int(available_balance)) - int(adjusted_balance)
-    tax = from_wei(int(tax_wei))
-    assert resp == translation_for(key=with_fees,
-                                   preferred_language=preferred_language,
-                                   available_balance=available_balance,
                                   tax=tax,
+                                   bonus=bonus,
                                   token_symbol=token_symbol)

    cached_statement = get_cached_statement(activated_account.blockchain_address)
@@ -108,7 +96,7 @@ def test_menu_processor(activated_account,
    display_key = 'ussd.kenya.display_user_metadata'
    ussd_menu = UssdMenu.find_by_name('display_user_metadata')
    name = ussd_menu.get('name')
-    identifier = bytes.fromhex(activated_account.blockchain_address)
+    identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
    person_metadata = PersonMetadata(identifier)
    cached_person_metadata = person_metadata.get_cached_metadata()
    resp = response(activated_account, display_key, name, init_database, generic_ussd_session)
@@ -135,15 +123,6 @@ def test_menu_processor(activated_account,
                                   account_balance=available_balance,
                                   account_token_name=token_symbol)

-    display_key = 'ussd.kenya.start'
-    ussd_menu = UssdMenu.find_by_name('start')
-    name = ussd_menu.get('name')
-    older_timestamp = (activated_account.created - datetime.timedelta(days=35))
-    activated_account.created = older_timestamp
-    init_database.flush()
-    response(activated_account, display_key, name, init_database, generic_ussd_session)
-    assert mock_get_adjusted_balance['timestamp'] == int((datetime.datetime.now() - datetime.timedelta(days=30)).timestamp())
-
    display_key = 'ussd.kenya.transaction_pin_authorization'
    ussd_menu = UssdMenu.find_by_name('transaction_pin_authorization')
    name = ussd_menu.get('name')
--- a/apps/cic-ussd/tests/cic_ussd/state_machine/logic/test_transaction_logic.py
+++ b/apps/cic-ussd/tests/cic_ussd/state_machine/logic/test_transaction_logic.py
@@ -49,7 +49,6 @@ def test_is_valid_transaction_amount(activated_account, amount, expected_result,
 ])
 def test_has_sufficient_balance(activated_account,
                                cache_balances,
-                                cache_default_token_data,
                                expected_result,
                                generic_ussd_session,
                                init_database,
--- a/apps/cic-ussd/tests/cic_ussd/tasks/test_callback_handler.py
+++ b/apps/cic-ussd/tests/cic_ussd/tasks/test_callback_handler.py
@@ -114,7 +114,6 @@ def test_statement_callback(activated_account, mocker, transactions_list):
    s_statement_callback.apply_async().get()
    statement_transactions = filter_statement_transactions(transactions_list)
    recipient_transaction, sender_transaction = transaction_actors(statement_transactions[0])
-    sender_transaction['alt_blockchain_address'] = recipient_transaction.get('blockchain_address')
    mock_statement_generate.assert_called_with(
        (activated_account.blockchain_address, sender_transaction), {}, queue='cic-ussd')

@@ -122,7 +121,6 @@ def test_statement_callback(activated_account, mocker, transactions_list):
 def test_transaction_balances_callback(activated_account,
                                       balances,
                                       cache_balances,
-                                       cache_default_token_data,
                                       cache_person_metadata,
                                       cache_preferences,
                                       load_chain_spec,
--- a/apps/cic-ussd/tests/cic_ussd/tasks/test_notifications_tasks.py
+++ b/apps/cic-ussd/tests/cic_ussd/tasks/test_notifications_tasks.py
@@ -13,8 +13,7 @@ from cic_ussd.translation import translation_for
 # tests imports


-def test_transaction(cache_default_token_data,
-                     celery_session_worker,
+def test_transaction(celery_session_worker,
                     load_support_phone,
                     mock_notifier_api,
                     notification_data,
--- a/apps/cic-ussd/tests/cic_ussd/tasks/test_processor_tasks.py
+++ b/apps/cic-ussd/tests/cic_ussd/tasks/test_processor_tasks.py
@@ -30,11 +30,10 @@ def test_generate_statement(activated_account,


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

 def test_parse_transaction(activated_account,
                           cache_person_metadata,
-                           cache_preferences,
                           celery_session_worker,
                           init_database,
+                           preferences,
                           transaction_result):
    recipient_transaction, sender_transaction = transaction_actors(transaction_result)
    assert sender_transaction.get('metadata_id') is None
    assert sender_transaction.get('phone_number') is None
    s_parse_transaction = celery.signature(
-        'cic_ussd.tasks.processor.parse_transaction', [sender_transaction])
+        'cic_ussd.tasks.processor.parse_transaction', [preferences, sender_transaction])
    result = s_parse_transaction.apply_async().get()
    assert result.get('metadata_id') == activated_account.standard_metadata_id()
    assert result.get('phone_number') == activated_account.phone_number
--- a/apps/cic-ussd/tests/fixtures/account.py
+++ b/apps/cic-ussd/tests/fixtures/account.py
@@ -54,7 +54,7 @@ def cache_account_creation_data(init_cache, account_creation_data):

@pytest.fixture(scope='function')
 def cache_balances(activated_account, balances, init_cache):
-    identifier = bytes.fromhex(activated_account.blockchain_address)
+    identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
    balances = json.dumps(balances[0])
    key = cache_data_key(identifier, ':cic.balances')
    cache_data(key, balances)
@@ -70,7 +70,7 @@ def cache_default_token_data(default_token_data, init_cache, load_chain_spec):

@pytest.fixture(scope='function')
 def cache_person_metadata(activated_account, init_cache, person_metadata):
-    identifier = bytes.fromhex(activated_account.blockchain_address)
+    identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
    person = json.dumps(person_metadata)
    key = cache_data_key(identifier, ':cic.person')
    cache_data(key, person)
@@ -78,7 +78,7 @@ def cache_person_metadata(activated_account, init_cache, person_metadata):

@pytest.fixture(scope='function')
 def cache_preferences(activated_account, init_cache, preferences):
-    identifier = bytes.fromhex(activated_account.blockchain_address)
+    identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
    preferences = json.dumps(preferences)
    key = cache_data_key(identifier, ':cic.preferences')
    cache_data(key, preferences)
@@ -86,10 +86,10 @@ def cache_preferences(activated_account, init_cache, preferences):

@pytest.fixture(scope='function')
 def cache_statement(activated_account, init_cache, statement):
-    identifier = bytes.fromhex(activated_account.blockchain_address)
-    statement = json.dumps(statement)
+    identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
+    preferences = json.dumps(statement)
    key = cache_data_key(identifier, ':cic.statement')
-    cache_data(key, statement)
+    cache_data(key, preferences)


@pytest.fixture(scope='function')
--- a/apps/cic-ussd/tests/fixtures/patches/account.py
+++ b/apps/cic-ussd/tests/fixtures/patches/account.py
@@ -41,22 +41,6 @@ def mock_async_balance_api_query(mocker):
    return query_args


-@pytest.fixture(scope='function')
-def mock_get_adjusted_balance(mocker, task_uuid):
-    query_args = {}
-
-    def get_adjusted_balance(self, token_symbol, balance, timestamp):
-        sync_res = mocker.patch('celery.result.AsyncResult')
-        sync_res.id = task_uuid
-        sync_res.result = 45931650.64654012
-        query_args['balance'] = balance
-        query_args['timestamp'] = timestamp
-        query_args['token_symbol'] = token_symbol
-        return sync_res
-    mocker.patch('cic_eth_aux.erc20_demurrage_token.api.Api.get_adjusted_balance', get_adjusted_balance)
-    return query_args
-
-
@pytest.fixture(scope='function')
 def mock_notifier_api(mocker):
    sms = {}
--- a/apps/cic-ussd/tests/fixtures/transaction.py
+++ b/apps/cic-ussd/tests/fixtures/transaction.py
@@ -7,7 +7,6 @@ import pytest
 # local import
 from cic_ussd.account.balance import get_cached_available_balance

-
 # tests imports


@@ -104,8 +103,8 @@ def transactions_list(activated_account, valid_recipient):
            'destination_token': '0x0000000000000000000000000000000000000000',
            'block_number': 80,
            'tx_index': 0,
-            'sender': '367cB0F65137b0A845c1DB4B7Ca47D3DEF32dDe8',
-            'recipient': '103d1ed6e370dBa6267045c70d4999384c18a04A',
+            'sender': '0x367cB0F65137b0A845c1DB4B7Ca47D3DEF32dDe8',
+            'recipient': '0x103d1ed6e370dBa6267045c70d4999384c18a04A',
            'from_value': 0,
            'to_value': 0,
            'date_created': '2021-07-14T14:13:46.036198',
@@ -123,8 +122,8 @@ def transactions_list(activated_account, valid_recipient):
            'destination_token': '0x0000000000000000000000000000000000000000',
            'block_number': 78,
            'tx_index': 0,
-            'sender': 'b41BfEE260693A473254D62b81aE1ADCC9E51AFb',
-            'recipient': '367cB0F65137b0A845c1DB4B7Ca47D3DEF32dDe8',
+            'sender': '0xb41BfEE260693A473254D62b81aE1ADCC9E51AFb',
+            'recipient': '0x367cB0F65137b0A845c1DB4B7Ca47D3DEF32dDe8',
            'from_value': 1800000000000000,
            'to_value': 1800000000000000,
            'date_created': '2021-07-14T14:13:35.839638',
@@ -143,8 +142,8 @@ def transactions_list(activated_account, valid_recipient):
            'destination_token': '0x0000000000000000000000000000000000000000',
            'block_number': 79,
            'tx_index': 0,
-            'sender': '367cB0F65137b0A845c1DB4B7Ca47D3DEF32dDe8',
-            'recipient': '103d1ed6e370dBa6267045c70d4999384c18a04A',
+            'sender': '0x367cB0F65137b0A845c1DB4B7Ca47D3DEF32dDe8',
+            'recipient': '0x103d1ed6e370dBa6267045c70d4999384c18a04A',
            'from_value': 0,
            'to_value': 0,
            'date_created': '2021-07-14T14:13:35.638355',
@@ -153,3 +152,4 @@ def transactions_list(activated_account, valid_recipient):
            'timestamp': 1626272015,
            'hash': '0x32ca3dd3bef06463b452f4d32f5f563d083cb4759219eed90f3d2a9c1791c5fc'}
    ]
+
--- a/apps/cic-ussd/tests/helpers/accounts.py
+++ b/apps/cic-ussd/tests/helpers/accounts.py
@@ -4,6 +4,7 @@ import random
 import uuid

 # external imports
+from chainlib.eth.address import to_checksum_address
 from faker import Faker
 from faker_e164.providers import E164Provider

@@ -20,7 +21,7 @@ def phone_number() -> str:


 def blockchain_address() -> str:
-    return os.urandom(20).hex().lower()
+    return to_checksum_address('0x' + os.urandom(20).hex())


 def session_id() -> str:
--- a/apps/cic-ussd/var/lib/locale/ussd.en.yml
+++ b/apps/cic-ussd/var/lib/locale/ussd.en.yml
@@ -141,22 +141,12 @@ en:
        0. Back
      retry: |-
        %{retry_pin_entry}
-    account_balances:
-      available_balance: |-
-        CON Your balances are as follows:
-          balance: %{available_balance} %{token_symbol}
-        0. Back
-      with_fees: |-
-        CON Your balances are as follows:
-          balances: %{available_balance} %{token_symbol}
-          fees: %{tax} %{token_symbol}
-        0. Back
-      with_rewards: |-
-        CON Your balances are as follows:
-          balance: %{available_balance} %{token_symbol}
-          fees: %{tax} %{token_symbol}
-          rewards: %{bonus} %{token_symbol}
-        0. Back
+    account_balances: |-
+      CON Your balances are as follows:
+        balance: %{available_balance} %{token_symbol}
+        fees: %{tax} %{token_symbol}
+        rewards: %{bonus} %{token_symbol}
+      0. Back
    first_transaction_set: |-
      CON %{first_transaction_set}
      1. Next
--- a/apps/cic-ussd/var/lib/locale/ussd.sw.yml
+++ b/apps/cic-ussd/var/lib/locale/ussd.sw.yml
@@ -140,22 +140,12 @@ sw:
        0. Nyuma
      retry: |-
        %{retry_pin_entry}
-    account_balances:
-      available_balance: |-
-        CON Salio zako ni zifuatazo:
-          salio: %{available_balance} %{token_symbol}
-        0. Nyuma
-      with_fees: |-
-        CON Salio zako ni zifuatazo:
-          salio: %{available_balance} %{token_symbol}
-          ushuru: %{tax} %{token_symbol}
-        0. Nyuma
-      with_rewards: |-
-        CON Salio zako ni zifuatazo:
-          salio: %{available_balance} %{token_symbol}
-          ushuru: %{tax} %{token_symbol}
-          tuzo: %{bonus} %{token_symbol}
-        0. Nyuma
+    account_balances: |-
+      CON Salio zako ni zifuatazo:
+        salio: %{available_balance} %{token_symbol}
+        ushuru: %{tax} %{token_symbol}
+        tuzo: %{bonus} %{token_symbol}
+      0. Nyuma
    first_transaction_set: |-
      CON %{first_transaction_set}
      1. Mbele
--- a/apps/contract-migration/config.sh
+++ b/apps/contract-migration/config.sh
@@ -35,11 +35,8 @@ export TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOY


 # Migration variable processing
-confini-dump --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
-echo "export CIC_TRUST_ADDRESS=$CIC_TRUST_ADDRESS
-export CIC_DEFAULT_TOKEN_SYMBOL=$CIC_DEFAULT_TOKEN_SYMBOL
-export WALLET_KEY_FILE=$WALLET_KEY_FILE
-" >> ${DEV_DATA_DIR}/env_reset
+
+confini-dump -vv --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset

 cat ${DEV_DATA_DIR}/env_reset

--- a/apps/contract-migration/config/config.ini
+++ b/apps/contract-migration/config/config.ini
@@ -1,3 +1,13 @@
+[token]
+name = Giftable Token
+symbol = GFT
+type = giftable_erc20_token
+demurrage_level = 196454828847045000000000000000000
+redistribution_period = 
+supply_limit = 
+sink_address = 
+
+
 [dev]
 eth_account_contract_deployer =
 eth_account_reserve_minter =
--- a/apps/contract-migration/requirements.txt
+++ b/apps/contract-migration/requirements.txt
@@ -1,15 +1,12 @@
 cic-eth[tools]==0.12.4a8
-chainlib-eth>=0.0.9rc1,<0.1.0
-chainlib==0.0.9rc1,<0.1.0
+chainlib-eth>=0.0.9a14,<0.1.0
 eth-erc20>=0.1.2a3,<0.2.0
 erc20-demurrage-token>=0.0.5a2,<0.1.0
-#eth-accounts-index>=0.1.2a2,<0.2.0
-eth-address-index>=0.2.4a1,<0.3.0
+eth-accounts-index>=0.1.2a2,<0.2.0
+eth-address-index>=0.2.3a4,<0.3.0
 cic-eth-registry>=0.6.1a2,<0.7.0
 erc20-transfer-authorization>=0.3.5a2,<0.4.0
 erc20-faucet>=0.3.2a2,<0.4.0
 sarafu-faucet>=0.0.7a2,<0.1.0
 confini>=0.4.2rc3,<1.0.0
-crypto-dev-signer>=0.4.15rc2,<=0.4.15
-eth-token-index>=0.2.4a1,<=0.3.0
-okota>=0.2.4a5,<0.3.0
+crypto-dev-signer>=0.4.15a7,<=0.4.15
--- a/apps/contract-migration/reset.sh
+++ b/apps/contract-migration/reset.sh
@@ -65,25 +65,22 @@ fi
 echo "giftable-token-gift $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -vv -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT"
 giftable-token-gift $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -u -vv -s -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT

+>&2 echo "deploy account index contract"
+DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -y $WALLET_KEY_FILE -vv -s -u -w`
+>&2 echo "add deployer address as account index writer"
+eth-accounts-index-writer $fee_price_arg -s -u -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_ACCOUNT_INDEX_ADDRESS -ww -vv $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
+
+>&2 echo "deploy contract registry contract"
+CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -y $WALLET_KEY_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry -p $RPC_PROVIDER -vv -s -u -w`
+eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $RPC_PROVIDER -vv --identifier ContractRegistry $CIC_REGISTRY_ADDRESS
+eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS
+
 # Deploy address declarator registry
 >&2 echo "deploy address declarator contract"
 declarator_description=0x546869732069732074686520434943206e6574776f726b000000000000000000
 DEV_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -s -u -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv $declarator_description`
-
->&2 echo "deploy contract registry contract"
-#CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -y $WALLET_KEY_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry -p $RPC_PROVIDER -vv -s -u -w`
-CIC_REGISTRY_ADDRESS=`okota-contract-registry-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -y $WALLET_KEY_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry --address-declarator $DEV_DECLARATOR_ADDRESS -p $RPC_PROVIDER -vv -s -u -w`
-eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $RPC_PROVIDER -vv --identifier ContractRegistry $CIC_REGISTRY_ADDRESS
-
 eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier AddressDeclarator $DEV_DECLARATOR_ADDRESS

->&2 echo "deploy account index contract"
-#DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -y $WALLET_KEY_FILE -vv -s -u -w`
-DEV_ACCOUNT_INDEX_ADDRESS=`okota-accounts-index-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -y $WALLET_KEY_FILE -vv -s -u -w --address-declarator $DEV_DECLARATOR_ADDRESS --token-address $DEV_RESERVE_ADDRESS`
-#>&2 echo "add deployer address as account index writer"
-#eth-accounts-index-writer $fee_price_arg -s -u -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_ACCOUNT_INDEX_ADDRESS -ww -vv $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
-eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS
-
 # Deploy transfer authorization contact
 >&2 echo "deploy transfer auth contract"
 DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy $gas_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv`
@@ -91,8 +88,7 @@ eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_RE

 # Deploy token index contract
 >&2 echo "deploy token index contract"
-#DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -s -u $fee_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv`
-DEV_TOKEN_INDEX_ADDRESS=`okota-token-index-deploy -s -u $fee_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv --address-declarator $DEV_DECLARATOR_ADDRESS`
+DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -s -u $fee_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv`
 eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier TokenRegistry $DEV_TOKEN_INDEX_ADDRESS 
 >&2 echo "add reserve token to token index"
 eth-token-index-add $fee_price_arg -s -u -w -y $WALLET_KEY_FILE  -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv -e $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS
@@ -114,12 +110,8 @@ giftable-token-minter -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $DEV_RESERV
 #echo "export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL" >> ${DEV_DATA_DIR}/env_reset
 export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL

-echo "Writing env_reset file ..."
-
-echo "export CIC_REGISTRY_ADDRESS=$CIC_REGISTRY_ADDRESS
-export CIC_DEFAULT_TOKEN_SYMBOL=$CIC_DEFAULT_TOKEN_SYMBOL
-export TOKEN_NAME=$TOKEN_NAME
-" >> "${DEV_DATA_DIR}"/env_reset
+confini-dump -vv --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
+confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 

 set +a
 set +e
--- a/apps/contract-migration/seed_cic_eth.sh
+++ b/apps/contract-migration/seed_cic_eth.sh
@@ -46,7 +46,7 @@ cic-eth-tag -i $CHAIN_SPEC TRANSFER_AUTHORIZATION_OWNER $DEV_ETH_ACCOUNT_TRANSFE
 DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER=`CONFINI_DIR=$empty_config_dir cic-eth-create $debug --redis-host $REDIS_HOST --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 cic-eth-tag -i $CHAIN_SPEC ACCOUNT_REGISTRY_WRITER $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER
 >&2 echo "add acccounts index writer account as writer on contract"
-#eth-accounts-index-writer -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -e $account_index_address -ww $debug $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER
+eth-accounts-index-writer -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -e $account_index_address -ww $debug $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER

 # Transfer gas to custodial gas provider adddress
 _CONFINI_DIR=$CONFINI_DIR
@@ -78,11 +78,12 @@ export DEV_ETH_SARAFU_TOKEN_ADDRESS=$DEV_ETH_RESERVE_ADDRESS
 >&2 erc20-transfer -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER --fee-limit 100000 -e $reserve_address -w $debug -a $DEV_ETH_ACCOUNT_SARAFU_GIFTER ${DEV_TOKEN_AMOUNT:0:-1}

 # Remove the SEND (8), QUEUE (16) and INIT (2) locks (or'ed), set by default at migration
-cic-eth-ctl -vv -i $CHAIN_SPEC unlock INIT
-cic-eth-ctl -vv -i $CHAIN_SPEC unlock SEND
-cic-eth-ctl -vv -i $CHAIN_SPEC unlock QUEUE
+echo "cic-eth-ctl -i $CHAIN_SPEC unlock INIT"
+cic-eth-ctl -i $CHAIN_SPEC unlock INIT
+cic-eth-ctl -i $CHAIN_SPEC unlock SEND
+cic-eth-ctl -i $CHAIN_SPEC unlock QUEUE

-#confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config
+confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 

 set +a
 set +e
--- a/apps/data-seeding/cic_ussd/import_balance.py
+++ b/apps/data-seeding/cic_ussd/import_balance.py
@@ -16,7 +16,7 @@ from crypto_dev_signer.keystore.dict import DictKeystore
 from import_util import BalanceProcessor, get_celery_worker_status
 from import_task import ImportTask, MetadataTask

-default_config_dir = '/usr/local/etc/data-seeding/'
+default_config_dir = './config'
 logg = logging.getLogger()

 arg_parser = argparse.ArgumentParser(description='Daemon worker that handles data seeding tasks.')
--- a/apps/data-seeding/config/cic.ini
+++ b/apps/data-seeding/config/cic.ini
@@ -1,10 +1,11 @@
 [cic]
-registry_address =
+registry_address = 0x32E860c2A0645d1B7B005273696905F5D6DC5D05
 token_index_address =
 accounts_index_address = 
 declarator_address = 
 approval_escrow_address =
-chain_spec =
+chain_spec = evm:bloxberg:8996
 tx_retry_delay = 
-trust_address =
+trust_address = 0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
 user_ussd_svc_service_port =
+
--- a/apps/data-seeding/create_import_users.py
+++ b/apps/data-seeding/create_import_users.py
@@ -28,11 +28,12 @@ logg = logging.getLogger()

 fake = Faker(['sl', 'en_US', 'no', 'de', 'ro'])

-default_config_dir = './config'
-
+script_dir = os.path.realpath(os.path.dirname(__file__))
+# config_dir = os.environ.get('CONFINI_DIR', '/usr/local/etc/cic')
+config_dir = os.environ.get('CONFINI_DIR', os.path.join(script_dir, 'config'))

 argparser = argparse.ArgumentParser()
-argparser.add_argument('-c', type=str, default=default_config_dir, help='Config dir')
+argparser.add_argument('-c', type=str, default=config_dir, help='Config dir')
 argparser.add_argument('--tag', type=str, action='append',
                       help='Tags to add to record')
 argparser.add_argument('--gift-threshold', type=int,
@@ -52,7 +53,7 @@ elif args.vv:

 config = confini.Config(args.c, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
-logg.debug('loaded config\n{}'.format(config))
+logg.info('loaded config\n{}'.format(config))


 dt_now = datetime.datetime.utcnow()
--- a/apps/data-seeding/docker/Dockerfile
+++ b/apps/data-seeding/docker/Dockerfile
@@ -13,8 +13,7 @@ COPY package.json \
 RUN npm ci --production 
 #RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install

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

 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
--- a/apps/data-seeding/docker/Dockerfile_ci
+++ b/apps/data-seeding/docker/Dockerfile_ci
@@ -9,16 +9,13 @@ COPY package.json \
     package-lock.json \
     .

+RUN npm install

-RUN npm ci --production 
-#RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install
-
-COPY requirements.txt .
-COPY config/ /usr/local/etc/data-seeding
+COPY requirements.txt . 

 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip pip install \
+RUN pip install \
    --extra-index-url $GITLAB_PYTHON_REGISTRY \
    --extra-index-url $EXTRA_INDEX_URL -r requirements.txt

--- a/apps/data-seeding/import_ussd.sh
+++ b/apps/data-seeding/import_ussd.sh
@@ -1,94 +1,60 @@
-#!/bin/bash
+#!/usr/bin/env bash

-if [[ -d "$OUT_DIR" ]]
-then
-  echo "found existing IMPORT DIR cleaning up..."
-  rm -rf "$OUT_DIR"
-  mkdir -p "$OUT_DIR"
-else
-  echo "IMPORT DIR does not exist creating it."
-  mkdir -p "$OUT_DIR"
-fi
-
-# using timeout because the timeout flag for celery inspect does not work
-timeout 5 celery inspect ping -b "$CELERY_BROKER_URL"
-if [[ $? -eq 124 ]]
-then
-  >&2 echo "Celery workers not available. Is the CELERY_BROKER_URL ($CELERY_BROKER_URL) correct?"
-  exit 1
-fi
+set -e

 echo "Creating seed data..."
-python create_import_users.py -vv  -c "$CONFIG" --dir "$OUT_DIR" "$NUMBER_OF_USERS"
+python create_import_users.py -vv --dir "$IMPORT_DIR" "$ACCOUNT_COUNT"
 wait $!
-
-echo "Check for running celery workers ..."
-if [ -f ./cic-ussd-import.pid ];
-then
-  echo "Found a running worker. Killing ..."
-  kill -9 $(<cic-ussd-import.pid)
-fi
-
 echo "Purge tasks from celery worker"
 celery -A cic_ussd.import_task purge -Q "$CELERY_QUEUE" --broker redis://"$REDIS_HOST":"$REDIS_PORT" -f
-
 echo "Start celery work and import balance job"
 if [ "$INCLUDE_BALANCES" != "y" ]
 then
  echo "Running worker without opening balance transactions"
-  TARGET_TX_COUNT=$NUMBER_OF_USERS
-  nohup python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$OUT_DIR" > nohup.out 2> nohup.err < /dev/null &
+  TARGET_TX_COUNT=$ACCOUNT_COUNT
+  python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$IMPORT_DIR" &
 else
  echo "Running worker with opening balance transactions"
-  TARGET_TX_COUNT=$((NUMBER_OF_USERS*2))
-  nohup python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --include-balances --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$OUT_DIR" &
+  TARGET_TX_COUNT=$((ACCOUNT_COUNT*2))
+  python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --include-balances --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$IMPORT_DIR" &
 fi

-echo "Target count set to ${TARGET_TX_COUNT}"
 until [ -f ./cic-import-ussd.pid ]
 do
  echo "Polling for celery worker pid file..."
  sleep 1
 done
 IMPORT_BALANCE_JOB=$(<cic-import-ussd.pid)
-
 echo "Start import users job"
 if [ "$USSD_SSL" == "y" ]
 then
  echo "Targeting secure ussd-user server"
-  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" "$OUT_DIR"
+  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" "$IMPORT_DIR"
 else
-  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" --ussd-no-ssl "$OUT_DIR"
+  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" --ussd-no-ssl "$IMPORT_DIR"
 fi
-
 echo "Waiting for import balance job to complete ..."
 tail --pid="$IMPORT_BALANCE_JOB" -f /dev/null
 set -e
-
 echo "Importing pins"
-python cic_ussd/import_pins.py -c "$CONFIG" -vv "$OUT_DIR"
+python cic_ussd/import_pins.py -c "$CONFIG" -vv "$IMPORT_DIR"
 set +e
 wait $!
 set -e
-
 echo "Importing ussd data"
-python cic_ussd/import_ussd_data.py -c "$CONFIG" -vv "$OUT_DIR"
+python cic_ussd/import_ussd_data.py -c "$CONFIG" -vv "$IMPORT_DIR"
 set +e
 wait $!
-
 echo "Importing person metadata"
-node cic_meta/import_meta.js "$OUT_DIR" "$NUMBER_OF_USERS"
-
+node cic_meta/import_meta.js "$IMPORT_DIR" "$ACCOUNT_COUNT"
 echo "Import preferences metadata"
-node cic_meta/import_meta_preferences.js "$OUT_DIR" "$NUMBER_OF_USERS"
-
+node cic_meta/import_meta_preferences.js "$IMPORT_DIR" "$ACCOUNT_COUNT"
 CIC_NOTIFY_DATABASE=postgres://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT/$NOTIFY_DATABASE_NAME
 NOTIFICATION_COUNT=$(psql -qtA "$CIC_NOTIFY_DATABASE" -c 'SELECT COUNT(message) FROM notification WHERE message IS NOT NULL')
 while [[ "$NOTIFICATION_COUNT" < "$TARGET_TX_COUNT" ]]
 do
  NOTIFICATION_COUNT=$(psql -qtA "$CIC_NOTIFY_DATABASE" -c 'SELECT COUNT(message) FROM notification WHERE message IS NOT NULL')
  sleep 5
-  echo "Notification count is: ${NOTIFICATION_COUNT} of ${TARGET_TX_COUNT}. Checking after 5 ..."
+  echo "Notification count is: ${NOTIFICATION_COUNT}. Checking after 5 ..."
 done
-echo "Running verify script."
-python verify.py -c "$CONFIG" -v -p "$ETH_PROVIDER"  -r "$CIC_REGISTRY_ADDRESS" --exclude "$EXCLUSIONS" --meta-provider "$META_URL" --token-symbol "$TOKEN_SYMBOL" --ussd-provider "$USSD_PROVIDER" "$OUT_DIR"
+python verify.py -c "$CONFIG" -v -p "$ETH_PROVIDER"  -r "$CIC_REGISTRY_ADDRESS" --exclude "$EXCLUSIONS" --token-symbol "$TOKEN_SYMBOL" "$IMPORT_DIR"
--- a/apps/data-seeding/requirements.txt
+++ b/apps/data-seeding/requirements.txt
@@ -1,14 +1,13 @@
-sarafu-faucet~=0.0.7a2
+sarafu-faucet~=0.0.7a1
 cic-eth[tools]~=0.12.4a8
-cic-types~=0.1.0a15
-crypto-dev-signer~=0.4.15a7
+cic-types~=0.1.0a14
+crypto-dev-signer>=0.4.15a4,<=0.4.15
 faker==4.17.1
 chainsyncer~=0.0.6a3
-chainlib-eth~=0.0.9a14
+chainlib-eth~=0.0.9a13
 eth-address-index~=0.2.3a4
 eth-contract-registry~=0.6.3a3
 eth-accounts-index~=0.1.2a3
-eth-erc20~=0.1.2a3
+eth-erc20~=0.1.2a2
 erc20-faucet~=0.3.2a2
 psycopg2==2.8.6
-liveness~=0.0.1a7
--- a/apps/data-seeding/verify.py
+++ b/apps/data-seeding/verify.py
@@ -164,8 +164,20 @@ for t in custodial_tests:
        logg.info('activating custodial module'.format(t))
        break

+cols = os.get_terminal_size().columns

-outfunc = logg.debug
+
+def to_terminalwidth(s):
+    ss = s.ljust(int(cols)-1)
+    ss += "\r"
+    return ss
+
+def default_outfunc(s):
+    ss = to_terminalwidth(s)
+    sys.stdout.write(ss)
+outfunc = default_outfunc
+if logg.isEnabledFor(logging.DEBUG):
+    outfunc = logg.debug


 def send_ussd_request(address, data_dir):
--- a/ci_templates/.cic-template.yml
+++ b/ci_templates/.cic-template.yml
@@ -1,12 +1,12 @@
+image:
+  name: gcr.io/kaniko-project/executor:debug
+  entrypoint: [""]

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

 .py_build_merge_request:
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
  stage: build
  script:
    - mkdir -p /kaniko/.docker
@@ -16,9 +16,6 @@ variables:
      --cache-repo $CI_REGISTRY_IMAGE --destination $MR_IMAGE_TAG 

 .py_build_target_dev:
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
  stage: build
  variables:
    IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:mr-unittest-$CI_COMMIT_SHORT_SHA
@@ -31,9 +28,6 @@ variables:
      --destination $MR_IMAGE_TAG

 .py_build_push:
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
  stage: build
  variables:
      IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
--- a/contracts/custodial/.custodial/bin/Activate.ps1
+++ b/contracts/custodial/.custodial/bin/Activate.ps1
@@ -1,241 +0,0 @@
-<#
-.Synopsis
-Activate a Python virtual environment for the current PowerShell session.
-
-.Description
-Pushes the python executable for a virtual environment to the front of the
-$Env:PATH environment variable and sets the prompt to signify that you are
-in a Python virtual environment. Makes use of the command line switches as
-well as the `pyvenv.cfg` file values present in the virtual environment.
-
-.Parameter VenvDir
-Path to the directory that contains the virtual environment to activate. The
-default value for this is the parent of the directory that the Activate.ps1
-script is located within.
-
-.Parameter Prompt
-The prompt prefix to display when this virtual environment is activated. By
-default, this prompt is the name of the virtual environment folder (VenvDir)
-surrounded by parentheses and followed by a single space (ie. '(.venv) ').
-
-.Example
-Activate.ps1
-Activates the Python virtual environment that contains the Activate.ps1 script.
-
-.Example
-Activate.ps1 -Verbose
-Activates the Python virtual environment that contains the Activate.ps1 script,
-and shows extra information about the activation as it executes.
-
-.Example
-Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv
-Activates the Python virtual environment located in the specified location.
-
-.Example
-Activate.ps1 -Prompt "MyPython"
-Activates the Python virtual environment that contains the Activate.ps1 script,
-and prefixes the current prompt with the specified string (surrounded in
-parentheses) while the virtual environment is active.
-
-.Notes
-On Windows, it may be required to enable this Activate.ps1 script by setting the
-execution policy for the user. You can do this by issuing the following PowerShell
-command:
-
-PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-
-For more information on Execution Policies: 
-https://go.microsoft.com/fwlink/?LinkID=135170
-
-#>
-Param(
-    [Parameter(Mandatory = $false)]
-    [String]
-    $VenvDir,
-    [Parameter(Mandatory = $false)]
-    [String]
-    $Prompt
-)
-
-<# Function declarations --------------------------------------------------- #>
-
-<#
-.Synopsis
-Remove all shell session elements added by the Activate script, including the
-addition of the virtual environment's Python executable from the beginning of
-the PATH variable.
-
-.Parameter NonDestructive
-If present, do not remove this function from the global namespace for the
-session.
-
-#>
-function global:deactivate ([switch]$NonDestructive) {
-    # Revert to original values
-
-    # The prior prompt:
-    if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) {
-        Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt
-        Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT
-    }
-
-    # The prior PYTHONHOME:
-    if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) {
-        Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME
-        Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME
-    }
-
-    # The prior PATH:
-    if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) {
-        Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH
-        Remove-Item -Path Env:_OLD_VIRTUAL_PATH
-    }
-
-    # Just remove the VIRTUAL_ENV altogether:
-    if (Test-Path -Path Env:VIRTUAL_ENV) {
-        Remove-Item -Path env:VIRTUAL_ENV
-    }
-
-    # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether:
-    if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) {
-        Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force
-    }
-
-    # Leave deactivate function in the global namespace if requested:
-    if (-not $NonDestructive) {
-        Remove-Item -Path function:deactivate
-    }
-}
-
-<#
-.Description
-Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the
-given folder, and returns them in a map.
-
-For each line in the pyvenv.cfg file, if that line can be parsed into exactly
-two strings separated by `=` (with any amount of whitespace surrounding the =)
-then it is considered a `key = value` line. The left hand string is the key,
-the right hand is the value.
-
-If the value starts with a `'` or a `"` then the first and last character is
-stripped from the value before being captured.
-
-.Parameter ConfigDir
-Path to the directory that contains the `pyvenv.cfg` file.
-#>
-function Get-PyVenvConfig(
-    [String]
-    $ConfigDir
-) {
-    Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg"
-
-    # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue).
-    $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue
-
-    # An empty map will be returned if no config file is found.
-    $pyvenvConfig = @{ }
-
-    if ($pyvenvConfigPath) {
-
-        Write-Verbose "File exists, parse `key = value` lines"
-        $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath
-
-        $pyvenvConfigContent | ForEach-Object {
-            $keyval = $PSItem -split "\s*=\s*", 2
-            if ($keyval[0] -and $keyval[1]) {
-                $val = $keyval[1]
-
-                # Remove extraneous quotations around a string value.
-                if ("'""".Contains($val.Substring(0, 1))) {
-                    $val = $val.Substring(1, $val.Length - 2)
-                }
-
-                $pyvenvConfig[$keyval[0]] = $val
-                Write-Verbose "Adding Key: '$($keyval[0])'='$val'"
-            }
-        }
-    }
-    return $pyvenvConfig
-}
-
-
-<# Begin Activate script --------------------------------------------------- #>
-
-# Determine the containing directory of this script
-$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
-$VenvExecDir = Get-Item -Path $VenvExecPath
-
-Write-Verbose "Activation script is located in path: '$VenvExecPath'"
-Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)"
-Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)"
-
-# Set values required in priority: CmdLine, ConfigFile, Default
-# First, get the location of the virtual environment, it might not be
-# VenvExecDir if specified on the command line.
-if ($VenvDir) {
-    Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values"
-}
-else {
-    Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir."
-    $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/")
-    Write-Verbose "VenvDir=$VenvDir"
-}
-
-# Next, read the `pyvenv.cfg` file to determine any required value such
-# as `prompt`.
-$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir
-
-# Next, set the prompt from the command line, or the config file, or
-# just use the name of the virtual environment folder.
-if ($Prompt) {
-    Write-Verbose "Prompt specified as argument, using '$Prompt'"
-}
-else {
-    Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value"
-    if ($pyvenvCfg -and $pyvenvCfg['prompt']) {
-        Write-Verbose "  Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'"
-        $Prompt = $pyvenvCfg['prompt'];
-    }
-    else {
-        Write-Verbose "  Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virutal environment)"
-        Write-Verbose "  Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'"
-        $Prompt = Split-Path -Path $venvDir -Leaf
-    }
-}
-
-Write-Verbose "Prompt = '$Prompt'"
-Write-Verbose "VenvDir='$VenvDir'"
-
-# Deactivate any currently active virtual environment, but leave the
-# deactivate function in place.
-deactivate -nondestructive
-
-# Now set the environment variable VIRTUAL_ENV, used by many tools to determine
-# that there is an activated venv.
-$env:VIRTUAL_ENV = $VenvDir
-
-if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) {
-
-    Write-Verbose "Setting prompt to '$Prompt'"
-
-    # Set the prompt to include the env name
-    # Make sure _OLD_VIRTUAL_PROMPT is global
-    function global:_OLD_VIRTUAL_PROMPT { "" }
-    Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT
-    New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt
-
-    function global:prompt {
-        Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) "
-        _OLD_VIRTUAL_PROMPT
-    }
-}
-
-# Clear PYTHONHOME
-if (Test-Path -Path Env:PYTHONHOME) {
-    Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME
-    Remove-Item -Path Env:PYTHONHOME
-}
-
-# Add the venv to the PATH
-Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH
-$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH"
--- a/contracts/custodial/.custodial/bin/activate
+++ b/contracts/custodial/.custodial/bin/activate
@@ -1,76 +0,0 @@
-# This file must be used with "source bin/activate" *from bash*
-# you cannot run it directly
-
-deactivate () {
-    # reset old environment variables
-    if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then
-        PATH="${_OLD_VIRTUAL_PATH:-}"
-        export PATH
-        unset _OLD_VIRTUAL_PATH
-    fi
-    if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then
-        PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}"
-        export PYTHONHOME
-        unset _OLD_VIRTUAL_PYTHONHOME
-    fi
-
-    # This should detect bash and zsh, which have a hash command that must
-    # be called to get it to forget past commands.  Without forgetting
-    # past commands the $PATH changes we made may not be respected
-    if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-        hash -r
-    fi
-
-    if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
-        PS1="${_OLD_VIRTUAL_PS1:-}"
-        export PS1
-        unset _OLD_VIRTUAL_PS1
-    fi
-
-    unset VIRTUAL_ENV
-    if [ ! "${1:-}" = "nondestructive" ] ; then
-    # Self destruct!
-        unset -f deactivate
-    fi
-}
-
-# unset irrelevant variables
-deactivate nondestructive
-
-VIRTUAL_ENV="/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial"
-export VIRTUAL_ENV
-
-_OLD_VIRTUAL_PATH="$PATH"
-PATH="$VIRTUAL_ENV/bin:$PATH"
-export PATH
-
-# unset PYTHONHOME if set
-# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
-# could use `if (set -u; : $PYTHONHOME) ;` in bash
-if [ -n "${PYTHONHOME:-}" ] ; then
-    _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}"
-    unset PYTHONHOME
-fi
-
-if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
-    _OLD_VIRTUAL_PS1="${PS1:-}"
-    if [ "x(.custodial) " != x ] ; then
-	PS1="(.custodial) ${PS1:-}"
-    else
-    if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then
-        # special case for Aspen magic directories
-        # see https://aspen.io/
-        PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1"
-    else
-        PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1"
-    fi
-    fi
-    export PS1
-fi
-
-# This should detect bash and zsh, which have a hash command that must
-# be called to get it to forget past commands.  Without forgetting
-# past commands the $PATH changes we made may not be respected
-if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
-    hash -r
-fi
--- a/contracts/custodial/.custodial/bin/activate.csh
+++ b/contracts/custodial/.custodial/bin/activate.csh
@@ -1,37 +0,0 @@
-# This file must be used with "source bin/activate.csh" *from csh*.
-# You cannot run it directly.
-# Created by Davide Di Blasi <davidedb@gmail.com>.
-# Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com>
-
-alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate'
-
-# Unset irrelevant variables.
-deactivate nondestructive
-
-setenv VIRTUAL_ENV "/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial"
-
-set _OLD_VIRTUAL_PATH="$PATH"
-setenv PATH "$VIRTUAL_ENV/bin:$PATH"
-
-
-set _OLD_VIRTUAL_PROMPT="$prompt"
-
-if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then
-    if (".custodial" != "") then
-        set env_name = ".custodial"
-    else
-        if (`basename "VIRTUAL_ENV"` == "__") then
-            # special case for Aspen magic directories
-            # see https://aspen.io/
-            set env_name = `basename \`dirname "$VIRTUAL_ENV"\``
-        else
-            set env_name = `basename "$VIRTUAL_ENV"`
-        endif
-    endif
-    set prompt = "[$env_name] $prompt"
-    unset env_name
-endif
-
-alias pydoc python -m pydoc
-
-rehash
--- a/contracts/custodial/.custodial/bin/activate.fish
+++ b/contracts/custodial/.custodial/bin/activate.fish
@@ -1,75 +0,0 @@
-# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org)
-# you cannot run it directly
-
-function deactivate  -d "Exit virtualenv and return to normal shell environment"
-    # reset old environment variables
-    if test -n "$_OLD_VIRTUAL_PATH"
-        set -gx PATH $_OLD_VIRTUAL_PATH
-        set -e _OLD_VIRTUAL_PATH
-    end
-    if test -n "$_OLD_VIRTUAL_PYTHONHOME"
-        set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME
-        set -e _OLD_VIRTUAL_PYTHONHOME
-    end
-
-    if test -n "$_OLD_FISH_PROMPT_OVERRIDE"
-        functions -e fish_prompt
-        set -e _OLD_FISH_PROMPT_OVERRIDE
-        functions -c _old_fish_prompt fish_prompt
-        functions -e _old_fish_prompt
-    end
-
-    set -e VIRTUAL_ENV
-    if test "$argv[1]" != "nondestructive"
-        # Self destruct!
-        functions -e deactivate
-    end
-end
-
-# unset irrelevant variables
-deactivate nondestructive
-
-set -gx VIRTUAL_ENV "/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial"
-
-set -gx _OLD_VIRTUAL_PATH $PATH
-set -gx PATH "$VIRTUAL_ENV/bin" $PATH
-
-# unset PYTHONHOME if set
-if set -q PYTHONHOME
-    set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME
-    set -e PYTHONHOME
-end
-
-if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
-    # fish uses a function instead of an env var to generate the prompt.
-
-    # save the current fish_prompt function as the function _old_fish_prompt
-    functions -c fish_prompt _old_fish_prompt
-
-    # with the original prompt function renamed, we can override with our own.
-    function fish_prompt
-        # Save the return status of the last command
-        set -l old_status $status
-
-        # Prompt override?
-        if test -n "(.custodial) "
-            printf "%s%s" "(.custodial) " (set_color normal)
-        else
-            # ...Otherwise, prepend env
-            set -l _checkbase (basename "$VIRTUAL_ENV")
-            if test $_checkbase = "__"
-                # special case for Aspen magic directories
-                # see https://aspen.io/
-                printf "%s[%s]%s " (set_color -b blue white) (basename (dirname "$VIRTUAL_ENV")) (set_color normal)
-            else
-                printf "%s(%s)%s" (set_color -b blue white) (basename "$VIRTUAL_ENV") (set_color normal)
-            end
-        end
-
-        # Restore the return status of the previous command.
-        echo "exit $old_status" | .
-        _old_fish_prompt
-    end
-
-    set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV"
-end
--- a/contracts/custodial/.custodial/bin/easy_install
+++ b/contracts/custodial/.custodial/bin/easy_install
@@ -1,8 +0,0 @@
-#!/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial/bin/python
-# -*- coding: utf-8 -*-
-import re
-import sys
-from setuptools.command.easy_install import main
-if __name__ == '__main__':
-    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-    sys.exit(main())
--- a/contracts/custodial/.custodial/bin/easy_install-3.8
+++ b/contracts/custodial/.custodial/bin/easy_install-3.8
@@ -1,8 +0,0 @@
-#!/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial/bin/python
-# -*- coding: utf-8 -*-
-import re
-import sys
-from setuptools.command.easy_install import main
-if __name__ == '__main__':
-    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-    sys.exit(main())
--- a/contracts/custodial/.custodial/bin/pip
+++ b/contracts/custodial/.custodial/bin/pip
@@ -1,8 +0,0 @@
-#!/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial/bin/python
-# -*- coding: utf-8 -*-
-import re
-import sys
-from pip._internal.cli.main import main
-if __name__ == '__main__':
-    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-    sys.exit(main())
--- a/contracts/custodial/.custodial/bin/pip3
+++ b/contracts/custodial/.custodial/bin/pip3
@@ -1,8 +0,0 @@
-#!/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial/bin/python
-# -*- coding: utf-8 -*-
-import re
-import sys
-from pip._internal.cli.main import main
-if __name__ == '__main__':
-    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-    sys.exit(main())
--- a/contracts/custodial/.custodial/bin/pip3.8
+++ b/contracts/custodial/.custodial/bin/pip3.8
@@ -1,8 +0,0 @@
-#!/Users/blairvanderlugt/projects/GrassrootsEconomics/services/cic-internal-integration/contracts/custodial/.custodial/bin/python
-# -*- coding: utf-8 -*-
-import re
-import sys
-from pip._internal.cli.main import main
-if __name__ == '__main__':
-    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-    sys.exit(main())
--- a/contracts/custodial/.custodial/bin/python
+++ b/contracts/custodial/.custodial/bin/python
@@ -1 +0,0 @@
-/Users/blairvanderlugt/.pyenv/versions/3.8.9/bin/python
--- a/contracts/custodial/.custodial/bin/python3
+++ b/contracts/custodial/.custodial/bin/python3
@@ -1 +0,0 @@
-python
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/easy_install.py
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/easy_install.py
@@ -1,5 +0,0 @@
-"""Run the EasyInstall command"""
-
-if __name__ == '__main__':
-    from setuptools.command.easy_install import main
-    main()
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/INSTALLER
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/INSTALLER
@@ -1 +0,0 @@
-pip
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/LICENSE.txt
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/LICENSE.txt
@@ -1,20 +0,0 @@
-Copyright (c) 2008-2019 The pip developers (see AUTHORS.txt file)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/METADATA
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/METADATA
@@ -1,88 +0,0 @@
-Metadata-Version: 2.1
-Name: pip
-Version: 20.2.3
-Summary: The PyPA recommended tool for installing Python packages.
-Home-page: https://pip.pypa.io/
-Author: The pip developers
-Author-email: distutils-sig@python.org
-License: MIT
-Project-URL: Documentation, https://pip.pypa.io
-Project-URL: Source, https://github.com/pypa/pip
-Project-URL: Changelog, https://pip.pypa.io/en/stable/news/
-Keywords: distutils easy_install egg setuptools wheel virtualenv
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
-
-pip - The Python Package Installer
-==================================
-
-.. image:: https://img.shields.io/pypi/v/pip.svg
-   :target: https://pypi.org/project/pip/
-
-.. image:: https://readthedocs.org/projects/pip/badge/?version=latest
-   :target: https://pip.pypa.io/en/latest
-
-pip is the `package installer`_ for Python. You can use pip to install packages from the `Python Package Index`_ and other indexes.
-
-Please take a look at our documentation for how to install and use pip:
-
-* `Installation`_
-* `Usage`_
-
-We release updates regularly, with a new version every 3 months. Find more details in our documentation:
-
-* `Release notes`_
-* `Release process`_
-
-In 2020, we're working on improvements to the heart of pip. Please `learn more and take our survey`_ to help us do it right.
-
-If you find bugs, need help, or want to talk to the developers, please use our mailing lists or chat rooms:
-
-* `Issue tracking`_
-* `Discourse channel`_
-* `User IRC`_
-
-If you want to get involved head over to GitHub to get the source code, look at our development documentation and feel free to jump on the developer mailing lists and chat rooms:
-
-* `GitHub page`_
-* `Development documentation`_
-* `Development mailing list`_
-* `Development IRC`_
-
-Code of Conduct
---------------
-
-Everyone interacting in the pip project's codebases, issue trackers, chat
-rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_.
-
-.. _package installer: https://packaging.python.org/guides/tool-recommendations/
-.. _Python Package Index: https://pypi.org
-.. _Installation: https://pip.pypa.io/en/stable/installing.html
-.. _Usage: https://pip.pypa.io/en/stable/
-.. _Release notes: https://pip.pypa.io/en/stable/news.html
-.. _Release process: https://pip.pypa.io/en/latest/development/release-process/
-.. _GitHub page: https://github.com/pypa/pip
-.. _Development documentation: https://pip.pypa.io/en/latest/development
-.. _learn more and take our survey: https://pyfound.blogspot.com/2020/03/new-pip-resolver-to-roll-out-this-year.html
-.. _Issue tracking: https://github.com/pypa/pip/issues
-.. _Discourse channel: https://discuss.python.org/c/packaging
-.. _Development mailing list: https://mail.python.org/mailman3/lists/distutils-sig.python.org/
-.. _User IRC: https://webchat.freenode.net/?channels=%23pypa
-.. _Development IRC: https://webchat.freenode.net/?channels=%23pypa-dev
-.. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/
-
-
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/RECORD
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/RECORD
@@ -1,752 +0,0 @@
-../../../bin/pip,sha256=rHSpmmJyhi-kYytF0-3Ws2uRliRiJ376ojbeYWx1LJE,332
-../../../bin/pip3,sha256=rHSpmmJyhi-kYytF0-3Ws2uRliRiJ376ojbeYWx1LJE,332
-../../../bin/pip3.8,sha256=rHSpmmJyhi-kYytF0-3Ws2uRliRiJ376ojbeYWx1LJE,332
-pip-20.2.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pip-20.2.3.dist-info/LICENSE.txt,sha256=W6Ifuwlk-TatfRU2LR7W1JMcyMj5_y1NkRkOEJvnRDE,1090
-pip-20.2.3.dist-info/METADATA,sha256=9mmHP3BezeQwiPj12NdLFspqcxqrf7xqW6OX9PwZSr4,3708
-pip-20.2.3.dist-info/RECORD,,
-pip-20.2.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip-20.2.3.dist-info/WHEEL,sha256=ADKeyaGyKF5DwBNE0sRE5pvW-bSkFMJfBuhzZ3rceP4,110
-pip-20.2.3.dist-info/entry_points.txt,sha256=HtfDOwpUlr9s73jqLQ6wF9V0_0qvUXJwCBz7Vwx0Ue0,125
-pip-20.2.3.dist-info/top_level.txt,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pip/__init__.py,sha256=NkPibWV383InU5x7DgeQLdL2zhlXTKjJRBMQTSKNYjI,455
-pip/__main__.py,sha256=bqCAM1cj1HwHCDx3WJa-LJxOBXimGxE8OjBqAvnhVg0,911
-pip/__pycache__/__init__.cpython-38.pyc,,
-pip/__pycache__/__main__.cpython-38.pyc,,
-pip/_internal/__init__.py,sha256=2si23JBW1erg19xIJ8CD6tfGknz0ijtXmzuXjGfGMGE,495
-pip/_internal/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/__pycache__/build_env.cpython-38.pyc,,
-pip/_internal/__pycache__/cache.cpython-38.pyc,,
-pip/_internal/__pycache__/configuration.cpython-38.pyc,,
-pip/_internal/__pycache__/exceptions.cpython-38.pyc,,
-pip/_internal/__pycache__/locations.cpython-38.pyc,,
-pip/_internal/__pycache__/main.cpython-38.pyc,,
-pip/_internal/__pycache__/pyproject.cpython-38.pyc,,
-pip/_internal/__pycache__/self_outdated_check.cpython-38.pyc,,
-pip/_internal/__pycache__/wheel_builder.cpython-38.pyc,,
-pip/_internal/build_env.py,sha256=9_UaQ2fpsBvpKAji27f7bPAi2v3mb0cBvDYcejwFKNM,8088
-pip/_internal/cache.py,sha256=pT17VVxgzZK32aqY5FRS8GyAI73LKzNMF8ZelQ7Ojm0,12249
-pip/_internal/cli/__init__.py,sha256=FkHBgpxxb-_gd6r1FjnNhfMOzAUYyXoXKJ6abijfcFU,132
-pip/_internal/cli/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/autocompletion.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/base_command.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/cmdoptions.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/command_context.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/main.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/main_parser.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/parser.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/progress_bars.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/req_command.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/spinners.cpython-38.pyc,,
-pip/_internal/cli/__pycache__/status_codes.cpython-38.pyc,,
-pip/_internal/cli/autocompletion.py,sha256=ekGNtcDI0p7rFVc-7s4T9Tbss4Jgb7vsB649XJIblRg,6547
-pip/_internal/cli/base_command.py,sha256=bf058xM1HE9QJCNEHExbuTjL0peKg9kSxCNxDtwAh88,9302
-pip/_internal/cli/cmdoptions.py,sha256=M_BtuqeyRpZAUUYytts3pguBCF2RaGukVpDPE0niroI,28782
-pip/_internal/cli/command_context.py,sha256=ygMVoTy2jpNilKT-6416gFSQpaBtrKRBbVbi2fy__EU,975
-pip/_internal/cli/main.py,sha256=Hxc9dZyW3xiDsYZX-_J2cGXT5DWNLNn_Y7o9oUme-Ec,2616
-pip/_internal/cli/main_parser.py,sha256=voAtjo4WVPIYeu7Fqabva9SXaB3BjG0gH93GBfe6jHQ,2843
-pip/_internal/cli/parser.py,sha256=4FfwW8xB84CrkLs35ud90ZkhCcWyVkx17XD6j3XCW7c,9480
-pip/_internal/cli/progress_bars.py,sha256=J1zykt2LI4gbBeXorfYRmYV5FgXhcW4x3r6xE_a7Z7c,9121
-pip/_internal/cli/req_command.py,sha256=Eiz8TVzeqzG-40t7qLC1vO-vzjCRvX9C-qXMyfw9D1I,15132
-pip/_internal/cli/spinners.py,sha256=PS9s53LB5aDPelIn8FhKerK3bOdgeefFH5wSWJ2PCzI,5509
-pip/_internal/cli/status_codes.py,sha256=F6uDG6Gj7RNKQJUDnd87QKqI16Us-t-B0wPF_4QMpWc,156
-pip/_internal/commands/__init__.py,sha256=yoLAnmEXjoQgYfDuwsuWG3RzzD19oeHobGEhmpIYsB4,4100
-pip/_internal/commands/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/cache.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/check.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/completion.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/configuration.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/debug.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/download.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/freeze.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/hash.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/help.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/install.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/list.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/search.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/show.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/uninstall.cpython-38.pyc,,
-pip/_internal/commands/__pycache__/wheel.cpython-38.pyc,,
-pip/_internal/commands/cache.py,sha256=U3rLjls0AMMO8PxnhXVwIp7Biyvns8-gBThKTH3tX7Y,5676
-pip/_internal/commands/check.py,sha256=fqRrz2uKPC8Qsx2rgLygAD2Rbr-qxp1Q55zUoyZzB9Q,1677
-pip/_internal/commands/completion.py,sha256=ObssM77quf61qvbuSE6XLwUBdm_WcWIvXFI-Hy1RBsI,3081
-pip/_internal/commands/configuration.py,sha256=IN2QBF653sRiRU7-pHTpnZ6_gyiXNKUQkLiLaNRLKNw,9344
-pip/_internal/commands/debug.py,sha256=otBZnpnostX2kmYyOl6g6CeCLmk6H00Tsj2CDsCtFXw,7314
-pip/_internal/commands/download.py,sha256=EKFlj_ceGUEJj6yCDw7P6w7yUoB16IcNHhT2qnCFDNQ,4918
-pip/_internal/commands/freeze.py,sha256=vLBBP1d8wgEXrmlh06hbz_x_Q1mWHUdiWDa9NP2eKLE,3452
-pip/_internal/commands/hash.py,sha256=v2nYCiEsEI9nEam1p6GwdG8xyj5gFv-4WrqvNexKmeY,1843
-pip/_internal/commands/help.py,sha256=ryuMDt2tc7ic3NJYMjjoNRH5r6LrB2yQVZvehAm8bLs,1270
-pip/_internal/commands/install.py,sha256=OXjZCNSioJRfP7YMkJyAWLl7X7-8f6DkhWlhPhG6fXk,27995
-pip/_internal/commands/list.py,sha256=2o3rYw37ECrhe4-Bu5s_2C0bwhYgghh4833MxcWAEug,11312
-pip/_internal/commands/search.py,sha256=1HPAFU-tmgKrHhr4xNuk3xMoPeSzD_oDvDDiUFZZ15E,5756
-pip/_internal/commands/show.py,sha256=r69-G8HIepDKm4SeyeHj0Ez1P9xoihrpVUyXm6NmXYY,6996
-pip/_internal/commands/uninstall.py,sha256=Ys8hwFsg0kvvGtLGYG3ibL5BKvURhlSlCX50ZQ-hsHk,3311
-pip/_internal/commands/wheel.py,sha256=-HSISE5AV29I752Aqw4DdmulrGd8rB_ZTOdpbJ6T8iM,6419
-pip/_internal/configuration.py,sha256=-Gxz2J-KuvxiqWIJ9F-XnYVZ5lKhNk7VO6ondEbH4EM,14115
-pip/_internal/distributions/__init__.py,sha256=ECBUW5Gtu9TjJwyFLvim-i6kUMYVuikNh9I5asL6tbA,959
-pip/_internal/distributions/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/distributions/__pycache__/base.cpython-38.pyc,,
-pip/_internal/distributions/__pycache__/installed.cpython-38.pyc,,
-pip/_internal/distributions/__pycache__/sdist.cpython-38.pyc,,
-pip/_internal/distributions/__pycache__/wheel.cpython-38.pyc,,
-pip/_internal/distributions/base.py,sha256=ruprpM_L2T2HNi3KLUHlbHimZ1sWVw-3Q0Lb8O7TDAI,1425
-pip/_internal/distributions/installed.py,sha256=YqlkBKr6TVP1MAYS6SG8ojud21wVOYLMZ8jMLJe9MSU,760
-pip/_internal/distributions/sdist.py,sha256=D4XTMlCwgPlK69l62GLYkNSVTVe99fR5iAcVt2EbGok,4086
-pip/_internal/distributions/wheel.py,sha256=95uD-TfaYoq3KiKBdzk9YMN4RRqJ28LNoSTS2K46gek,1294
-pip/_internal/exceptions.py,sha256=ZVpArxQrSlm4qAMtHaY3nHvG_t5eSi3WCnMowdm_m8I,12637
-pip/_internal/index/__init__.py,sha256=vpt-JeTZefh8a-FC22ZeBSXFVbuBcXSGiILhQZJaNpQ,30
-pip/_internal/index/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/index/__pycache__/collector.cpython-38.pyc,,
-pip/_internal/index/__pycache__/package_finder.cpython-38.pyc,,
-pip/_internal/index/collector.py,sha256=rMdGdAABOrvIl0DYlCMWXr7mIoqrU2VGeQpCuWiPu1Q,22838
-pip/_internal/index/package_finder.py,sha256=ISieDd20dOSndMNybafCu3pO2JR3BKOfHv92Bes0j0Q,37364
-pip/_internal/locations.py,sha256=7YjzJy2CroQD8GBMemnHWRl9448BSIt0lfH98B-Dkd8,6732
-pip/_internal/main.py,sha256=IVBnUQ-FG7DK6617uEXRB5_QJqspAsBFmTmTesYkbdQ,437
-pip/_internal/models/__init__.py,sha256=3DHUd_qxpPozfzouoqa9g9ts1Czr5qaHfFxbnxriepM,63
-pip/_internal/models/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/models/__pycache__/candidate.cpython-38.pyc,,
-pip/_internal/models/__pycache__/direct_url.cpython-38.pyc,,
-pip/_internal/models/__pycache__/format_control.cpython-38.pyc,,
-pip/_internal/models/__pycache__/index.cpython-38.pyc,,
-pip/_internal/models/__pycache__/link.cpython-38.pyc,,
-pip/_internal/models/__pycache__/scheme.cpython-38.pyc,,
-pip/_internal/models/__pycache__/search_scope.cpython-38.pyc,,
-pip/_internal/models/__pycache__/selection_prefs.cpython-38.pyc,,
-pip/_internal/models/__pycache__/target_python.cpython-38.pyc,,
-pip/_internal/models/__pycache__/wheel.cpython-38.pyc,,
-pip/_internal/models/candidate.py,sha256=gACeCSHTIaWuB6RAeLmGJnbFFbKfp_47UERDoC_ldOU,1195
-pip/_internal/models/direct_url.py,sha256=MnBLPci1hE9Ndh6d3m0LAqB7hX3ci80CCJTE5eerFaQ,6900
-pip/_internal/models/format_control.py,sha256=RdnnmXxVJppCZWzWEmFTr-zD_m3G0izPLqJi6Iop75M,2823
-pip/_internal/models/index.py,sha256=carvxxaT7mJyoEkptaECHUZiNaA6R5NrsGF55zawNn8,1161
-pip/_internal/models/link.py,sha256=FMlxvqKmLoj7xTQSgKqfO2ehE1WcgD4C5DmEBuC_Qos,7470
-pip/_internal/models/scheme.py,sha256=EhPkT_6G0Md84JTLSVopYsp5H_K6BREYmFvU8H6wMK8,778
-pip/_internal/models/search_scope.py,sha256=Lum0mY4_pdR9DDBy6HV5xHGIMPp_kU8vMsqYKFHZip4,4751
-pip/_internal/models/selection_prefs.py,sha256=pgNjTfgePPiX1R5S2S8Yc6odOfU9NzG7YP_m_gnS0kw,2044
-pip/_internal/models/target_python.py,sha256=R7tAXI15B_cgw7Fgnq5cI9F-44goUZncH9JMtE8pXRw,4034
-pip/_internal/models/wheel.py,sha256=FTfzVb4WIbfIehxhdlAVvCil_MQ0-W44oyN56cE6NHc,2772
-pip/_internal/network/__init__.py,sha256=jf6Tt5nV_7zkARBrKojIXItgejvoegVJVKUbhAa5Ioc,50
-pip/_internal/network/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/network/__pycache__/auth.cpython-38.pyc,,
-pip/_internal/network/__pycache__/cache.cpython-38.pyc,,
-pip/_internal/network/__pycache__/download.cpython-38.pyc,,
-pip/_internal/network/__pycache__/lazy_wheel.cpython-38.pyc,,
-pip/_internal/network/__pycache__/session.cpython-38.pyc,,
-pip/_internal/network/__pycache__/utils.cpython-38.pyc,,
-pip/_internal/network/__pycache__/xmlrpc.cpython-38.pyc,,
-pip/_internal/network/auth.py,sha256=dt3NvTRJ8182S3VpdYFEZMPT0JhOKHyFtR-O-JMlJII,11652
-pip/_internal/network/cache.py,sha256=6cCD7XNrqh1d1lOSY5U-0ZXOG1YwEgMYs-VhRZVyzMA,2329
-pip/_internal/network/download.py,sha256=VTGDO01_nX-5MCdatd4Icv0F88_M8N3WnW6BevA6a0o,5151
-pip/_internal/network/lazy_wheel.py,sha256=RXcQILT5v5UO6kxgv76CSncLTqRL29o-OXbaW2aK7t4,8138
-pip/_internal/network/session.py,sha256=Zs0uiyPxTpfpgSv-ZI9hK9TjasmTplBuBivOTcUiJME,15208
-pip/_internal/network/utils.py,sha256=ZPHg7u6DEcg2EvILIdPECnvPLp21OPHxNVmeXfMy-n0,4172
-pip/_internal/network/xmlrpc.py,sha256=PFCiX_nnwYxC8SFIf7J3trP40ECGjA6fl2-IVNhbkPM,1882
-pip/_internal/operations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_internal/operations/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/operations/__pycache__/check.cpython-38.pyc,,
-pip/_internal/operations/__pycache__/freeze.cpython-38.pyc,,
-pip/_internal/operations/__pycache__/prepare.cpython-38.pyc,,
-pip/_internal/operations/build/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_internal/operations/build/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/operations/build/__pycache__/metadata.cpython-38.pyc,,
-pip/_internal/operations/build/__pycache__/metadata_legacy.cpython-38.pyc,,
-pip/_internal/operations/build/__pycache__/wheel.cpython-38.pyc,,
-pip/_internal/operations/build/__pycache__/wheel_legacy.cpython-38.pyc,,
-pip/_internal/operations/build/metadata.py,sha256=2aILgWCQTF1aIhWuCH8TTSjv_kYmA3x1262fT2FQ6pQ,1254
-pip/_internal/operations/build/metadata_legacy.py,sha256=VgzBTk8naIO8-8N_ifEYF7ZAxWUDhphWVIaVlZ2FqYM,2011
-pip/_internal/operations/build/wheel.py,sha256=33vdkxTO-gNqrtWH1eNL_uZo4Irax85moDx2o9zae3M,1465
-pip/_internal/operations/build/wheel_legacy.py,sha256=N1aqNZyGURBX0Bj6wPmB0t4866oMbxoHUpC9pz6FyT0,3356
-pip/_internal/operations/check.py,sha256=JYDsVLvpFyJuJq0ttStgg8TRKbc0myYFAMnfnnQOREM,5215
-pip/_internal/operations/freeze.py,sha256=_vJSZwHBNzBV0GpRUSXhUJz3BrGFdcT2aTcWxH1L4P0,10373
-pip/_internal/operations/install/__init__.py,sha256=mX7hyD2GNBO2mFGokDQ30r_GXv7Y_PLdtxcUv144e-s,51
-pip/_internal/operations/install/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/operations/install/__pycache__/editable_legacy.cpython-38.pyc,,
-pip/_internal/operations/install/__pycache__/legacy.cpython-38.pyc,,
-pip/_internal/operations/install/__pycache__/wheel.cpython-38.pyc,,
-pip/_internal/operations/install/editable_legacy.py,sha256=rJ_xs2qtDUjpY2-n6eYlVyZiNoKbOtZXZrYrcnIELt4,1488
-pip/_internal/operations/install/legacy.py,sha256=zu3Gw54dgHtluyW5n8j5qKcAScidQXJvqB8fb0oLB-4,4281
-pip/_internal/operations/install/wheel.py,sha256=nJmOSOYY3keksXd_3GFuhAWeeoKvGOyoSGbjXABjZ40,31310
-pip/_internal/operations/prepare.py,sha256=Rt7Yh7w10_Q-vI3b7R1wkt2R6XPX8YVUdODk-TaGI9c,19903
-pip/_internal/pyproject.py,sha256=VJKsrXORGiGoDPVKCQhuu4tWlQSTOhoiRlVLRNu4rx4,7400
-pip/_internal/req/__init__.py,sha256=s-E5Vxxqqpcs7xfY5gY69oHogsWJ4sLbnUiDoWmkHOU,3133
-pip/_internal/req/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/req/__pycache__/constructors.cpython-38.pyc,,
-pip/_internal/req/__pycache__/req_file.cpython-38.pyc,,
-pip/_internal/req/__pycache__/req_install.cpython-38.pyc,,
-pip/_internal/req/__pycache__/req_set.cpython-38.pyc,,
-pip/_internal/req/__pycache__/req_tracker.cpython-38.pyc,,
-pip/_internal/req/__pycache__/req_uninstall.cpython-38.pyc,,
-pip/_internal/req/constructors.py,sha256=LrSHbRHu52-h6HM1qJKG68o1Jw5q8MvJGfr4As6j2uU,16387
-pip/_internal/req/req_file.py,sha256=p7n3Y0q275Eisqfxd0vtfnxYvlT6TCCY0tj75p-yiOY,19448
-pip/_internal/req/req_install.py,sha256=5IYle0AaLivlkZo6mhU9sj30CbzPqLe92csBnAfJq8U,33610
-pip/_internal/req/req_set.py,sha256=dxcfbieWYfYkTJNE07U8xaO40zLxl8BhWOcIHVFTmoo,7886
-pip/_internal/req/req_tracker.py,sha256=qWaiejNK6o6cqeyTOIGKIU1CoyrXCcqgMHYi3cqelOA,4690
-pip/_internal/req/req_uninstall.py,sha256=opMGDGb7ZaFippRbaarJaljtzl2CNZmBGEUSnTubE-A,23706
-pip/_internal/resolution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_internal/resolution/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/resolution/__pycache__/base.cpython-38.pyc,,
-pip/_internal/resolution/base.py,sha256=xi72YmIS-lEjyK13PN_3qkGGthA4yGoK0C6qWynyHrE,682
-pip/_internal/resolution/legacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_internal/resolution/legacy/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/resolution/legacy/__pycache__/resolver.cpython-38.pyc,,
-pip/_internal/resolution/legacy/resolver.py,sha256=d-qW6UUxbZqKyXmX2bqnW5C8UtnO0ZcsQuKw_QXualc,18755
-pip/_internal/resolution/resolvelib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_internal/resolution/resolvelib/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/resolution/resolvelib/__pycache__/base.cpython-38.pyc,,
-pip/_internal/resolution/resolvelib/__pycache__/candidates.cpython-38.pyc,,
-pip/_internal/resolution/resolvelib/__pycache__/factory.cpython-38.pyc,,
-pip/_internal/resolution/resolvelib/__pycache__/provider.cpython-38.pyc,,
-pip/_internal/resolution/resolvelib/__pycache__/requirements.cpython-38.pyc,,
-pip/_internal/resolution/resolvelib/__pycache__/resolver.cpython-38.pyc,,
-pip/_internal/resolution/resolvelib/base.py,sha256=n8Rilea9jCzhlbtFiJKwCwIQSPW0ATjEKsCc0Vpm894,2342
-pip/_internal/resolution/resolvelib/candidates.py,sha256=RHo9r9g25FWzufKv93Ti9nS4hvAPUrhAjSDL7GCZFNQ,20339
-pip/_internal/resolution/resolvelib/factory.py,sha256=--ahYsr-r9zIhdyJJ1ZuETgaQrWiPIqwILWiMDn1IIU,17169
-pip/_internal/resolution/resolvelib/provider.py,sha256=BP8nh07Z1FlcT-Iaw4FblRM-DjUeUkiItKdKARYeM6M,6134
-pip/_internal/resolution/resolvelib/requirements.py,sha256=lGvoHRhkusRfaz4cFxYBoQNqxS6TeuO3K68qlui6g-0,4511
-pip/_internal/resolution/resolvelib/resolver.py,sha256=kI8g0NVlYIsDMRmDplWQdox6WO-0H7CI2wN-1ixnaew,10149
-pip/_internal/self_outdated_check.py,sha256=q6_nqUHPpt-DScwD97h7FCSqd4nI1s-xkpOI4I5Za3Y,6779
-pip/_internal/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_internal/utils/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/appdirs.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/compat.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/compatibility_tags.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/datetime.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/deprecation.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/direct_url_helpers.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/distutils_args.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/encoding.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/entrypoints.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/filesystem.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/filetypes.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/glibc.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/hashes.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/inject_securetransport.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/logging.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/misc.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/models.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/packaging.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/parallel.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/pkg_resources.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/setuptools_build.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/subprocess.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/temp_dir.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/typing.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/unpacking.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/urls.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/virtualenv.cpython-38.pyc,,
-pip/_internal/utils/__pycache__/wheel.cpython-38.pyc,,
-pip/_internal/utils/appdirs.py,sha256=RZzUG-Bkh2b-miX0DSZ3v703_-bgK-v0PfWCCjwVE9g,1349
-pip/_internal/utils/compat.py,sha256=GoCSUMoUmTGeg5irQGLDZ7v12As87yHrMzBXEke-njg,8865
-pip/_internal/utils/compatibility_tags.py,sha256=EtBJj-pstj_U0STUZ8FjlG7YDTjuRZUy6GY1cM86yv8,5439
-pip/_internal/utils/datetime.py,sha256=KL-vIdGU9JIpGB5NYkmwXWkH-G_2mvvABlmRtoSZsao,295
-pip/_internal/utils/deprecation.py,sha256=pBnNogoA4UGTxa_JDnPXBRRYpKMbExAhXpBwAwklOBs,3318
-pip/_internal/utils/direct_url_helpers.py,sha256=bZCBNwPQVyZpYGjX_VcomvVvRHvKw-9JzEV-Ft09LQc,4359
-pip/_internal/utils/distutils_args.py,sha256=a56mblNxk9BGifbpEETG61mmBrqhjtjRkJ4HYn-oOEE,1350
-pip/_internal/utils/encoding.py,sha256=wHDJ25yCT_T4ySscCL3P978OpLrfDCpitg8D64IEXMY,1284
-pip/_internal/utils/entrypoints.py,sha256=vHcNpnksCv6mllihU6hfifdsKPEjwcaJ1aLIXEaynaU,1152
-pip/_internal/utils/filesystem.py,sha256=-fU3XteCAIJwf_9FvCZU7vhywvt3nuf_cqkCdwgy1Y8,6943
-pip/_internal/utils/filetypes.py,sha256=R2FwzoeX7b-rZALOXx5cuO8VPPMhUQ4ne7wm3n3IcWA,571
-pip/_internal/utils/glibc.py,sha256=LOeNGgawCKS-4ke9fii78fwXD73dtNav3uxz1Bf-Ab8,3297
-pip/_internal/utils/hashes.py,sha256=xHmrqNwC1eBN0oY0R_RXLJLXGvFdo5gwmbz_pas94k8,4358
-pip/_internal/utils/inject_securetransport.py,sha256=M17ZlFVY66ApgeASVjKKLKNz0LAfk-SyU0HZ4ZB6MmI,810
-pip/_internal/utils/logging.py,sha256=YIfuDUEkmdn9cIRQ_Ec8rgXs1m5nOwDECtZqM4CBH5U,13093
-pip/_internal/utils/misc.py,sha256=QQZWMJkKKADPSWQYmrwlasc8b03eCcghn0yDNprYgrI,28001
-pip/_internal/utils/models.py,sha256=HqiBVtTbW_b_Umvj2fjhDWOHo2RKhPwSz4iAYkQZ688,1201
-pip/_internal/utils/packaging.py,sha256=VtiwcAAL7LBi7tGL2je7LeW4bE11KMHGCsJ1NZY5XtM,3035
-pip/_internal/utils/parallel.py,sha256=7az3aaTMCkqpaLFbpYYOvk0rj7Hu5YH1NPXXomqjgf4,3404
-pip/_internal/utils/pkg_resources.py,sha256=ZX-k7V5q_aNWyDse92nN7orN1aCpRLsaxzpkBZ1XKzU,1254
-pip/_internal/utils/setuptools_build.py,sha256=E1KswI7wfNnCDE5R6G8c9ZbByENpu7NqocjY26PCQDw,5058
-pip/_internal/utils/subprocess.py,sha256=UkPe89gcjxBMx73uutoeJXgD3kwdlL6YO16BkjDdVSI,9924
-pip/_internal/utils/temp_dir.py,sha256=blmG0jEvEgdxbYUt_V15bgcTIJIrxZwAw8QZlCTJYDE,8378
-pip/_internal/utils/typing.py,sha256=xkYwOeHlf4zsHXBDC4310HtEqwhQcYXFPq2h35Tcrl0,1401
-pip/_internal/utils/unpacking.py,sha256=YFAckhqqvmehA8Kan5vd3b1kN_9TafqmOk4b-yz4fho,9488
-pip/_internal/utils/urls.py,sha256=q2rw1kMiiig_XZcoyJSsWMJQqYw-2wUmrMoST4mCW_I,1527
-pip/_internal/utils/virtualenv.py,sha256=fNGrRp-8QmNL5OzXajBd-z7PbwOsx1XY6G-AVMAhfso,3706
-pip/_internal/utils/wheel.py,sha256=wFzn3h8GqYvgsyWPZtUyn0Rb3MJzmtyP3owMOhKnmL0,7303
-pip/_internal/vcs/__init__.py,sha256=viJxJRqRE_mVScum85bgQIXAd6o0ozFt18VpC-qIJrM,617
-pip/_internal/vcs/__pycache__/__init__.cpython-38.pyc,,
-pip/_internal/vcs/__pycache__/bazaar.cpython-38.pyc,,
-pip/_internal/vcs/__pycache__/git.cpython-38.pyc,,
-pip/_internal/vcs/__pycache__/mercurial.cpython-38.pyc,,
-pip/_internal/vcs/__pycache__/subversion.cpython-38.pyc,,
-pip/_internal/vcs/__pycache__/versioncontrol.cpython-38.pyc,,
-pip/_internal/vcs/bazaar.py,sha256=5rRR02uDZTLaxQT-R5Obd8FZDOMlShqYds-pwVSJJs8,3887
-pip/_internal/vcs/git.py,sha256=kvB729wrKY0OWMSgOS1pUly4LosZp8utrd3kOQsWalA,13985
-pip/_internal/vcs/mercurial.py,sha256=FzCGmYzVZvB-vyM73fKcQk2B4jMNXGnXlQ2bJ7nmglM,5162
-pip/_internal/vcs/subversion.py,sha256=rldcn9ZDt5twjNPzFn_FKRn4qdfkjlxHMJEsR2MFfoA,12399
-pip/_internal/vcs/versioncontrol.py,sha256=WpxeTRC0NoGB2uXJdmfq4pPxY-p7sk1rV_WkxMxgzQA,25966
-pip/_internal/wheel_builder.py,sha256=6w1VPXrpUvCCPlV0cI1wNaCqNz4laF6B6whvaxl9cns,9522
-pip/_vendor/__init__.py,sha256=CsxnpYPbi_2agrDI79iQrCmQeZRcwwIF0C6cm_1RynU,4588
-pip/_vendor/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/__pycache__/appdirs.cpython-38.pyc,,
-pip/_vendor/__pycache__/contextlib2.cpython-38.pyc,,
-pip/_vendor/__pycache__/distro.cpython-38.pyc,,
-pip/_vendor/__pycache__/ipaddress.cpython-38.pyc,,
-pip/_vendor/__pycache__/pyparsing.cpython-38.pyc,,
-pip/_vendor/__pycache__/retrying.cpython-38.pyc,,
-pip/_vendor/__pycache__/six.cpython-38.pyc,,
-pip/_vendor/appdirs.py,sha256=M6IYRJtdZgmSPCXCSMBRB0VT3P8MdFbWCDbSLrB2Ebg,25907
-pip/_vendor/cachecontrol/__init__.py,sha256=pJtAaUxOsMPnytI1A3juAJkXYDr8krdSnsg4Yg3OBEg,302
-pip/_vendor/cachecontrol/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/_cmd.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/adapter.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/cache.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/compat.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/controller.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/filewrapper.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/heuristics.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/serialize.cpython-38.pyc,,
-pip/_vendor/cachecontrol/__pycache__/wrapper.cpython-38.pyc,,
-pip/_vendor/cachecontrol/_cmd.py,sha256=URGE0KrA87QekCG3SGPatlSPT571dZTDjNa-ZXX3pDc,1295
-pip/_vendor/cachecontrol/adapter.py,sha256=sSwaSYd93IIfCFU4tOMgSo6b2LCt_gBSaQUj8ktJFOA,4882
-pip/_vendor/cachecontrol/cache.py,sha256=1fc4wJP8HYt1ycnJXeEw5pCpeBL2Cqxx6g9Fb0AYDWQ,805
-pip/_vendor/cachecontrol/caches/__init__.py,sha256=-gHNKYvaeD0kOk5M74eOrsSgIKUtC6i6GfbmugGweEo,86
-pip/_vendor/cachecontrol/caches/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/cachecontrol/caches/__pycache__/file_cache.cpython-38.pyc,,
-pip/_vendor/cachecontrol/caches/__pycache__/redis_cache.cpython-38.pyc,,
-pip/_vendor/cachecontrol/caches/file_cache.py,sha256=nYVKsJtXh6gJXvdn1iWyrhxvkwpQrK-eKoMRzuiwkKk,4153
-pip/_vendor/cachecontrol/caches/redis_cache.py,sha256=HxelMpNCo-dYr2fiJDwM3hhhRmxUYtB5tXm1GpAAT4Y,856
-pip/_vendor/cachecontrol/compat.py,sha256=kHNvMRdt6s_Xwqq_9qJmr9ou3wYMOMUMxPPcwNxT8Mc,695
-pip/_vendor/cachecontrol/controller.py,sha256=CWEX3pedIM9s60suf4zZPtm_JvVgnvogMGK_OiBG5F8,14149
-pip/_vendor/cachecontrol/filewrapper.py,sha256=vACKO8Llzu_ZWyjV1Fxn1MA4TGU60N5N3GSrAFdAY2Q,2533
-pip/_vendor/cachecontrol/heuristics.py,sha256=BFGHJ3yQcxvZizfo90LLZ04T_Z5XSCXvFotrp7Us0sc,4070
-pip/_vendor/cachecontrol/serialize.py,sha256=vIa4jvq4x_KSOLdEIedoknX2aXYHQujLDFV4-F21Dno,7091
-pip/_vendor/cachecontrol/wrapper.py,sha256=5LX0uJwkNQUtYSEw3aGmGu9WY8wGipd81mJ8lG0d0M4,690
-pip/_vendor/certifi/__init__.py,sha256=u1E_DrSGj_nnEkK5VglvEqP8D80KpghLVWL0A_pq41A,62
-pip/_vendor/certifi/__main__.py,sha256=1k3Cr95vCxxGRGDljrW3wMdpZdL3Nhf0u1n-k2qdsCY,255
-pip/_vendor/certifi/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/certifi/__pycache__/__main__.cpython-38.pyc,,
-pip/_vendor/certifi/__pycache__/core.cpython-38.pyc,,
-pip/_vendor/certifi/cacert.pem,sha256=GhT24f0R7_9y4YY_hkXwkO7BthZhRGDCEMO348E9S14,282394
-pip/_vendor/certifi/core.py,sha256=jBrwKEWpG0IKcuozK0BQ2HHGp8adXAOyBPC7ddgR6vM,2315
-pip/_vendor/chardet/__init__.py,sha256=YsP5wQlsHJ2auF1RZJfypiSrCA7_bQiRm3ES_NI76-Y,1559
-pip/_vendor/chardet/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/big5freq.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/big5prober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/chardistribution.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/charsetgroupprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/charsetprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/codingstatemachine.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/compat.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/cp949prober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/enums.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/escprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/escsm.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/eucjpprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/euckrfreq.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/euckrprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/euctwfreq.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/euctwprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/gb2312freq.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/gb2312prober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/hebrewprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/jisfreq.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/jpcntx.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/langbulgarianmodel.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/langcyrillicmodel.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/langgreekmodel.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/langhebrewmodel.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/langhungarianmodel.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/langthaimodel.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/langturkishmodel.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/latin1prober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/mbcharsetprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/mbcsgroupprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/mbcssm.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/sbcharsetprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/sbcsgroupprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/sjisprober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/universaldetector.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/utf8prober.cpython-38.pyc,,
-pip/_vendor/chardet/__pycache__/version.cpython-38.pyc,,
-pip/_vendor/chardet/big5freq.py,sha256=D_zK5GyzoVsRes0HkLJziltFQX0bKCLOrFe9_xDvO_8,31254
-pip/_vendor/chardet/big5prober.py,sha256=kBxHbdetBpPe7xrlb-e990iot64g_eGSLd32lB7_h3M,1757
-pip/_vendor/chardet/chardistribution.py,sha256=3woWS62KrGooKyqz4zQSnjFbJpa6V7g02daAibTwcl8,9411
-pip/_vendor/chardet/charsetgroupprober.py,sha256=6bDu8YIiRuScX4ca9Igb0U69TA2PGXXDej6Cc4_9kO4,3787
-pip/_vendor/chardet/charsetprober.py,sha256=KSmwJErjypyj0bRZmC5F5eM7c8YQgLYIjZXintZNstg,5110
-pip/_vendor/chardet/cli/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pip/_vendor/chardet/cli/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/chardet/cli/__pycache__/chardetect.cpython-38.pyc,,
-pip/_vendor/chardet/cli/chardetect.py,sha256=DI8dlV3FBD0c0XA_y3sQ78z754DUv1J8n34RtDjOXNw,2774
-pip/_vendor/chardet/codingstatemachine.py,sha256=VYp_6cyyki5sHgXDSZnXW4q1oelHc3cu9AyQTX7uug8,3590
-pip/_vendor/chardet/compat.py,sha256=PKTzHkSbtbHDqS9PyujMbX74q1a8mMpeQTDVsQhZMRw,1134
-pip/_vendor/chardet/cp949prober.py,sha256=TZ434QX8zzBsnUvL_8wm4AQVTZ2ZkqEEQL_lNw9f9ow,1855
-pip/_vendor/chardet/enums.py,sha256=Aimwdb9as1dJKZaFNUH2OhWIVBVd6ZkJJ_WK5sNY8cU,1661
-pip/_vendor/chardet/escprober.py,sha256=kkyqVg1Yw3DIOAMJ2bdlyQgUFQhuHAW8dUGskToNWSc,3950
-pip/_vendor/chardet/escsm.py,sha256=RuXlgNvTIDarndvllNCk5WZBIpdCxQ0kcd9EAuxUh84,10510
-pip/_vendor/chardet/eucjpprober.py,sha256=iD8Jdp0ISRjgjiVN7f0e8xGeQJ5GM2oeZ1dA8nbSeUw,3749
-pip/_vendor/chardet/euckrfreq.py,sha256=-7GdmvgWez4-eO4SuXpa7tBiDi5vRXQ8WvdFAzVaSfo,13546
-pip/_vendor/chardet/euckrprober.py,sha256=MqFMTQXxW4HbzIpZ9lKDHB3GN8SP4yiHenTmf8g_PxY,1748
-pip/_vendor/chardet/euctwfreq.py,sha256=No1WyduFOgB5VITUA7PLyC5oJRNzRyMbBxaKI1l16MA,31621
-pip/_vendor/chardet/euctwprober.py,sha256=13p6EP4yRaxqnP4iHtxHOJ6R2zxHq1_m8hTRjzVZ95c,1747
-pip/_vendor/chardet/gb2312freq.py,sha256=JX8lsweKLmnCwmk8UHEQsLgkr_rP_kEbvivC4qPOrlc,20715
-pip/_vendor/chardet/gb2312prober.py,sha256=gGvIWi9WhDjE-xQXHvNIyrnLvEbMAYgyUSZ65HUfylw,1754
-pip/_vendor/chardet/hebrewprober.py,sha256=c3SZ-K7hvyzGY6JRAZxJgwJ_sUS9k0WYkvMY00YBYFo,13838
-pip/_vendor/chardet/jisfreq.py,sha256=vpmJv2Bu0J8gnMVRPHMFefTRvo_ha1mryLig8CBwgOg,25777
-pip/_vendor/chardet/jpcntx.py,sha256=PYlNqRUQT8LM3cT5FmHGP0iiscFlTWED92MALvBungo,19643
-pip/_vendor/chardet/langbulgarianmodel.py,sha256=1HqQS9Pbtnj1xQgxitJMvw8X6kKr5OockNCZWfEQrPE,12839
-pip/_vendor/chardet/langcyrillicmodel.py,sha256=LODajvsetH87yYDDQKA2CULXUH87tI223dhfjh9Zx9c,17948
-pip/_vendor/chardet/langgreekmodel.py,sha256=8YAW7bU8YwSJap0kIJSbPMw1BEqzGjWzqcqf0WgUKAA,12688
-pip/_vendor/chardet/langhebrewmodel.py,sha256=JSnqmE5E62tDLTPTvLpQsg5gOMO4PbdWRvV7Avkc0HA,11345
-pip/_vendor/chardet/langhungarianmodel.py,sha256=RhapYSG5l0ZaO-VV4Fan5sW0WRGQqhwBM61yx3yxyOA,12592
-pip/_vendor/chardet/langthaimodel.py,sha256=8l0173Gu_W6G8mxmQOTEF4ls2YdE7FxWf3QkSxEGXJQ,11290
-pip/_vendor/chardet/langturkishmodel.py,sha256=W22eRNJsqI6uWAfwXSKVWWnCerYqrI8dZQTm_M0lRFk,11102
-pip/_vendor/chardet/latin1prober.py,sha256=S2IoORhFk39FEFOlSFWtgVybRiP6h7BlLldHVclNkU8,5370
-pip/_vendor/chardet/mbcharsetprober.py,sha256=AR95eFH9vuqSfvLQZN-L5ijea25NOBCoXqw8s5O9xLQ,3413
-pip/_vendor/chardet/mbcsgroupprober.py,sha256=h6TRnnYq2OxG1WdD5JOyxcdVpn7dG0q-vB8nWr5mbh4,2012
-pip/_vendor/chardet/mbcssm.py,sha256=SY32wVIF3HzcjY3BaEspy9metbNSKxIIB0RKPn7tjpI,25481
-pip/_vendor/chardet/sbcharsetprober.py,sha256=LDSpCldDCFlYwUkGkwD2oFxLlPWIWXT09akH_2PiY74,5657
-pip/_vendor/chardet/sbcsgroupprober.py,sha256=1IprcCB_k1qfmnxGC6MBbxELlKqD3scW6S8YIwdeyXA,3546
-pip/_vendor/chardet/sjisprober.py,sha256=IIt-lZj0WJqK4rmUZzKZP4GJlE8KUEtFYVuY96ek5MQ,3774
-pip/_vendor/chardet/universaldetector.py,sha256=qL0174lSZE442eB21nnktT9_VcAye07laFWUeUrjttY,12485
-pip/_vendor/chardet/utf8prober.py,sha256=IdD8v3zWOsB8OLiyPi-y_fqwipRFxV9Nc1eKBLSuIEw,2766
-pip/_vendor/chardet/version.py,sha256=sp3B08mrDXB-pf3K9fqJ_zeDHOCLC8RrngQyDFap_7g,242
-pip/_vendor/colorama/__init__.py,sha256=DqjXH9URVP3IJwmMt7peYw50ns1RNAymIB9-XdPEFV8,239
-pip/_vendor/colorama/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/colorama/__pycache__/ansi.cpython-38.pyc,,
-pip/_vendor/colorama/__pycache__/ansitowin32.cpython-38.pyc,,
-pip/_vendor/colorama/__pycache__/initialise.cpython-38.pyc,,
-pip/_vendor/colorama/__pycache__/win32.cpython-38.pyc,,
-pip/_vendor/colorama/__pycache__/winterm.cpython-38.pyc,,
-pip/_vendor/colorama/ansi.py,sha256=Fi0un-QLqRm-v7o_nKiOqyC8PapBJK7DLV_q9LKtTO0,2524
-pip/_vendor/colorama/ansitowin32.py,sha256=u8QaqdqS_xYSfNkPM1eRJLHz6JMWPodaJaP0mxgHCDc,10462
-pip/_vendor/colorama/initialise.py,sha256=PprovDNxMTrvoNHFcL2NZjpH2XzDc8BLxLxiErfUl4k,1915
-pip/_vendor/colorama/win32.py,sha256=bJ8Il9jwaBN5BJ8bmN6FoYZ1QYuMKv2j8fGrXh7TJjw,5404
-pip/_vendor/colorama/winterm.py,sha256=2y_2b7Zsv34feAsP67mLOVc-Bgq51mdYGo571VprlrM,6438
-pip/_vendor/contextlib2.py,sha256=5HjGflUzwWAUfcILhSmC2GqvoYdZZzFzVfIDztHigUs,16915
-pip/_vendor/distlib/__init__.py,sha256=3veAk2rPznOB2gsK6tjbbh0TQMmGE5P82eE9wXq6NIk,581
-pip/_vendor/distlib/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/compat.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/database.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/index.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/locators.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/manifest.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/markers.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/metadata.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/resources.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/scripts.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/util.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/version.cpython-38.pyc,,
-pip/_vendor/distlib/__pycache__/wheel.cpython-38.pyc,,
-pip/_vendor/distlib/_backport/__init__.py,sha256=bqS_dTOH6uW9iGgd0uzfpPjo6vZ4xpPZ7kyfZJ2vNaw,274
-pip/_vendor/distlib/_backport/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/distlib/_backport/__pycache__/misc.cpython-38.pyc,,
-pip/_vendor/distlib/_backport/__pycache__/shutil.cpython-38.pyc,,
-pip/_vendor/distlib/_backport/__pycache__/sysconfig.cpython-38.pyc,,
-pip/_vendor/distlib/_backport/__pycache__/tarfile.cpython-38.pyc,,
-pip/_vendor/distlib/_backport/misc.py,sha256=KWecINdbFNOxSOP1fGF680CJnaC6S4fBRgEtaYTw0ig,971
-pip/_vendor/distlib/_backport/shutil.py,sha256=IX_G2NPqwecJibkIDje04bqu0xpHkfSQ2GaGdEVqM5Y,25707
-pip/_vendor/distlib/_backport/sysconfig.cfg,sha256=swZKxq9RY5e9r3PXCrlvQPMsvOdiWZBTHLEbqS8LJLU,2617
-pip/_vendor/distlib/_backport/sysconfig.py,sha256=BQHFlb6pubCl_dvT1NjtzIthylofjKisox239stDg0U,26854
-pip/_vendor/distlib/_backport/tarfile.py,sha256=Ihp7rXRcjbIKw8COm9wSePV9ARGXbSF9gGXAMn2Q-KU,92628
-pip/_vendor/distlib/compat.py,sha256=ADA56xiAxar3mU6qemlBhNbsrFPosXRhO44RzsbJPqk,41408
-pip/_vendor/distlib/database.py,sha256=Kl0YvPQKc4OcpVi7k5cFziydM1xOK8iqdxLGXgbZHV4,51059
-pip/_vendor/distlib/index.py,sha256=SXKzpQCERctxYDMp_OLee2f0J0e19ZhGdCIoMlUfUQM,21066
-pip/_vendor/distlib/locators.py,sha256=c9E4cDEacJ_uKbuE5BqAVocoWp6rsuBGTkiNDQq3zV4,52100
-pip/_vendor/distlib/manifest.py,sha256=nQEhYmgoreaBZzyFzwYsXxJARu3fo4EkunU163U16iE,14811
-pip/_vendor/distlib/markers.py,sha256=6Ac3cCfFBERexiESWIOXmg-apIP8l2esafNSX3KMy-8,4387
-pip/_vendor/distlib/metadata.py,sha256=z2KPy3h3tcDnb9Xs7nAqQ5Oz0bqjWAUFmKWcFKRoodg,38962
-pip/_vendor/distlib/resources.py,sha256=2FGv0ZHF14KXjLIlL0R991lyQQGcewOS4mJ-5n-JVnc,10766
-pip/_vendor/distlib/scripts.py,sha256=_MAj3sMuv56kuM8FsiIWXqbT0gmumPGaOR_atOzn4a4,17180
-pip/_vendor/distlib/t32.exe,sha256=NS3xBCVAld35JVFNmb-1QRyVtThukMrwZVeXn4LhaEQ,96768
-pip/_vendor/distlib/t64.exe,sha256=oAqHes78rUWVM0OtVqIhUvequl_PKhAhXYQWnUf7zR0,105984
-pip/_vendor/distlib/util.py,sha256=f2jZCPrcLCt6LcnC0gUy-Fur60tXD8reA7k4rDpHMDw,59845
-pip/_vendor/distlib/version.py,sha256=_n7F6juvQGAcn769E_SHa7fOcf5ERlEVymJ_EjPRwGw,23391
-pip/_vendor/distlib/w32.exe,sha256=lJtnZdeUxTZWya_EW5DZos_K5rswRECGspIl8ZJCIXs,90112
-pip/_vendor/distlib/w64.exe,sha256=0aRzoN2BO9NWW4ENy4_4vHkHR4qZTFZNVSAJJYlODTI,99840
-pip/_vendor/distlib/wheel.py,sha256=v6DnwTqhNHwrEVFr8_YeiTW6G4ftP_evsywNgrmdb2o,41144
-pip/_vendor/distro.py,sha256=xxMIh2a3KmippeWEHzynTdHT3_jZM0o-pos0dAWJROM,43628
-pip/_vendor/html5lib/__init__.py,sha256=BYzcKCqeEii52xDrqBFruhnmtmkiuHXFyFh-cglQ8mk,1160
-pip/_vendor/html5lib/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/html5lib/__pycache__/_ihatexml.cpython-38.pyc,,
-pip/_vendor/html5lib/__pycache__/_inputstream.cpython-38.pyc,,
-pip/_vendor/html5lib/__pycache__/_tokenizer.cpython-38.pyc,,
-pip/_vendor/html5lib/__pycache__/_utils.cpython-38.pyc,,
-pip/_vendor/html5lib/__pycache__/constants.cpython-38.pyc,,
-pip/_vendor/html5lib/__pycache__/html5parser.cpython-38.pyc,,
-pip/_vendor/html5lib/__pycache__/serializer.cpython-38.pyc,,
-pip/_vendor/html5lib/_ihatexml.py,sha256=ifOwF7pXqmyThIXc3boWc96s4MDezqRrRVp7FwDYUFs,16728
-pip/_vendor/html5lib/_inputstream.py,sha256=jErNASMlkgs7MpOM9Ve_VdLDJyFFweAjLuhVutZz33U,32353
-pip/_vendor/html5lib/_tokenizer.py,sha256=04mgA2sNTniutl2fxFv-ei5bns4iRaPxVXXHh_HrV_4,77040
-pip/_vendor/html5lib/_trie/__init__.py,sha256=nqfgO910329BEVJ5T4psVwQtjd2iJyEXQ2-X8c1YxwU,109
-pip/_vendor/html5lib/_trie/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/html5lib/_trie/__pycache__/_base.cpython-38.pyc,,
-pip/_vendor/html5lib/_trie/__pycache__/py.cpython-38.pyc,,
-pip/_vendor/html5lib/_trie/_base.py,sha256=CaybYyMro8uERQYjby2tTeSUatnWDfWroUN9N7ety5w,1013
-pip/_vendor/html5lib/_trie/py.py,sha256=wXmQLrZRf4MyWNyg0m3h81m9InhLR7GJ002mIIZh-8o,1775
-pip/_vendor/html5lib/_utils.py,sha256=Dx9AKntksRjFT1veBj7I362pf5OgIaT0zglwq43RnfU,4931
-pip/_vendor/html5lib/constants.py,sha256=Ll-yzLU_jcjyAI_h57zkqZ7aQWE5t5xA4y_jQgoUUhw,83464
-pip/_vendor/html5lib/filters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_vendor/html5lib/filters/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/__pycache__/alphabeticalattributes.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/__pycache__/base.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/__pycache__/inject_meta_charset.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/__pycache__/lint.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/__pycache__/optionaltags.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/__pycache__/sanitizer.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/__pycache__/whitespace.cpython-38.pyc,,
-pip/_vendor/html5lib/filters/alphabeticalattributes.py,sha256=lViZc2JMCclXi_5gduvmdzrRxtO5Xo9ONnbHBVCsykU,919
-pip/_vendor/html5lib/filters/base.py,sha256=z-IU9ZAYjpsVsqmVt7kuWC63jR11hDMr6CVrvuao8W0,286
-pip/_vendor/html5lib/filters/inject_meta_charset.py,sha256=egDXUEHXmAG9504xz0K6ALDgYkvUrC2q15YUVeNlVQg,2945
-pip/_vendor/html5lib/filters/lint.py,sha256=jk6q56xY0ojiYfvpdP-OZSm9eTqcAdRqhCoPItemPYA,3643
-pip/_vendor/html5lib/filters/optionaltags.py,sha256=8lWT75J0aBOHmPgfmqTHSfPpPMp01T84NKu0CRedxcE,10588
-pip/_vendor/html5lib/filters/sanitizer.py,sha256=m6oGmkBhkGAnn2nV6D4hE78SCZ6WEnK9rKdZB3uXBIc,26897
-pip/_vendor/html5lib/filters/whitespace.py,sha256=8eWqZxd4UC4zlFGW6iyY6f-2uuT8pOCSALc3IZt7_t4,1214
-pip/_vendor/html5lib/html5parser.py,sha256=anr-aXre_ImfrkQ35c_rftKXxC80vJCREKe06Tq15HA,117186
-pip/_vendor/html5lib/serializer.py,sha256=_PpvcZF07cwE7xr9uKkZqh5f4UEaI8ltCU2xPJzaTpk,15759
-pip/_vendor/html5lib/treeadapters/__init__.py,sha256=A0rY5gXIe4bJOiSGRO_j_tFhngRBO8QZPzPtPw5dFzo,679
-pip/_vendor/html5lib/treeadapters/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/html5lib/treeadapters/__pycache__/genshi.cpython-38.pyc,,
-pip/_vendor/html5lib/treeadapters/__pycache__/sax.cpython-38.pyc,,
-pip/_vendor/html5lib/treeadapters/genshi.py,sha256=CH27pAsDKmu4ZGkAUrwty7u0KauGLCZRLPMzaO3M5vo,1715
-pip/_vendor/html5lib/treeadapters/sax.py,sha256=BKS8woQTnKiqeffHsxChUqL4q2ZR_wb5fc9MJ3zQC8s,1776
-pip/_vendor/html5lib/treebuilders/__init__.py,sha256=AysSJyvPfikCMMsTVvaxwkgDieELD5dfR8FJIAuq7hY,3592
-pip/_vendor/html5lib/treebuilders/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/html5lib/treebuilders/__pycache__/base.cpython-38.pyc,,
-pip/_vendor/html5lib/treebuilders/__pycache__/dom.cpython-38.pyc,,
-pip/_vendor/html5lib/treebuilders/__pycache__/etree.cpython-38.pyc,,
-pip/_vendor/html5lib/treebuilders/__pycache__/etree_lxml.cpython-38.pyc,,
-pip/_vendor/html5lib/treebuilders/base.py,sha256=z-o51vt9r_l2IDG5IioTOKGzZne4Fy3_Fc-7ztrOh4I,14565
-pip/_vendor/html5lib/treebuilders/dom.py,sha256=22whb0C71zXIsai5mamg6qzBEiigcBIvaDy4Asw3at0,8925
-pip/_vendor/html5lib/treebuilders/etree.py,sha256=w5ZFpKk6bAxnrwD2_BrF5EVC7vzz0L3LMi9Sxrbc_8w,12836
-pip/_vendor/html5lib/treebuilders/etree_lxml.py,sha256=9gqDjs-IxsPhBYa5cpvv2FZ1KZlG83Giusy2lFmvIkE,14766
-pip/_vendor/html5lib/treewalkers/__init__.py,sha256=OBPtc1TU5mGyy18QDMxKEyYEz0wxFUUNj5v0-XgmYhY,5719
-pip/_vendor/html5lib/treewalkers/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/html5lib/treewalkers/__pycache__/base.cpython-38.pyc,,
-pip/_vendor/html5lib/treewalkers/__pycache__/dom.cpython-38.pyc,,
-pip/_vendor/html5lib/treewalkers/__pycache__/etree.cpython-38.pyc,,
-pip/_vendor/html5lib/treewalkers/__pycache__/etree_lxml.cpython-38.pyc,,
-pip/_vendor/html5lib/treewalkers/__pycache__/genshi.cpython-38.pyc,,
-pip/_vendor/html5lib/treewalkers/base.py,sha256=ouiOsuSzvI0KgzdWP8PlxIaSNs9falhbiinAEc_UIJY,7476
-pip/_vendor/html5lib/treewalkers/dom.py,sha256=EHyFR8D8lYNnyDU9lx_IKigVJRyecUGua0mOi7HBukc,1413
-pip/_vendor/html5lib/treewalkers/etree.py,sha256=xo1L5m9VtkfpFJK0pFmkLVajhqYYVisVZn3k9kYpPkI,4551
-pip/_vendor/html5lib/treewalkers/etree_lxml.py,sha256=_b0LAVWLcVu9WaU_-w3D8f0IRSpCbjf667V-3NRdhTw,6357
-pip/_vendor/html5lib/treewalkers/genshi.py,sha256=4D2PECZ5n3ZN3qu3jMl9yY7B81jnQApBQSVlfaIuYbA,2309
-pip/_vendor/idna/__init__.py,sha256=9Nt7xpyet3DmOrPUGooDdAwmHZZu1qUAy2EaJ93kGiQ,58
-pip/_vendor/idna/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/idna/__pycache__/codec.cpython-38.pyc,,
-pip/_vendor/idna/__pycache__/compat.cpython-38.pyc,,
-pip/_vendor/idna/__pycache__/core.cpython-38.pyc,,
-pip/_vendor/idna/__pycache__/idnadata.cpython-38.pyc,,
-pip/_vendor/idna/__pycache__/intranges.cpython-38.pyc,,
-pip/_vendor/idna/__pycache__/package_data.cpython-38.pyc,,
-pip/_vendor/idna/__pycache__/uts46data.cpython-38.pyc,,
-pip/_vendor/idna/codec.py,sha256=lvYb7yu7PhAqFaAIAdWcwgaWI2UmgseUua-1c0AsG0A,3299
-pip/_vendor/idna/compat.py,sha256=R-h29D-6mrnJzbXxymrWUW7iZUvy-26TQwZ0ij57i4U,232
-pip/_vendor/idna/core.py,sha256=jCoaLb3bA2tS_DDx9PpGuNTEZZN2jAzB369aP-IHYRE,11951
-pip/_vendor/idna/idnadata.py,sha256=gmzFwZWjdms3kKZ_M_vwz7-LP_SCgYfSeE03B21Qpsk,42350
-pip/_vendor/idna/intranges.py,sha256=TY1lpxZIQWEP6tNqjZkFA5hgoMWOj1OBmnUG8ihT87E,1749
-pip/_vendor/idna/package_data.py,sha256=bxBjpLnE06_1jSYKEy5svOMu1zM3OMztXVUb1tPlcp0,22
-pip/_vendor/idna/uts46data.py,sha256=lMdw2zdjkH1JUWXPPEfFUSYT3Fyj60bBmfLvvy5m7ko,202084
-pip/_vendor/ipaddress.py,sha256=-0RmurI31XgAaN20WCi0zrcuoat90nNA70_6yGlx2PU,79875
-pip/_vendor/msgpack/__init__.py,sha256=2gJwcsTIaAtCM0GMi2rU-_Y6kILeeQuqRkrQ22jSANc,1118
-pip/_vendor/msgpack/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/msgpack/__pycache__/_version.cpython-38.pyc,,
-pip/_vendor/msgpack/__pycache__/exceptions.cpython-38.pyc,,
-pip/_vendor/msgpack/__pycache__/ext.cpython-38.pyc,,
-pip/_vendor/msgpack/__pycache__/fallback.cpython-38.pyc,,
-pip/_vendor/msgpack/_version.py,sha256=hu7lzmZ_ClOaOOmRsWb4xomhzQ4UIsLsvv8KY6UysHE,20
-pip/_vendor/msgpack/exceptions.py,sha256=dCTWei8dpkrMsQDcjQk74ATl9HsIBH0ybt8zOPNqMYc,1081
-pip/_vendor/msgpack/ext.py,sha256=nV19BzE9Be8SJHrxxYJHFbvEHJaXcP3avRkHVp5wovM,6034
-pip/_vendor/msgpack/fallback.py,sha256=Z8V3iYUUPqKVy4WWTk64Vq3G0PylQIOmlWvgnMhmkdU,37133
-pip/_vendor/packaging/__about__.py,sha256=PNMsaZn4UcCHyubgROH1bl6CluduPjI5kFrSp_Zgklo,736
-pip/_vendor/packaging/__init__.py,sha256=6enbp5XgRfjBjsI9-bn00HjHf5TH21PDMOKkJW8xw-w,562
-pip/_vendor/packaging/__pycache__/__about__.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/_compat.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/_structures.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/_typing.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/markers.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/requirements.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/specifiers.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/tags.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/utils.cpython-38.pyc,,
-pip/_vendor/packaging/__pycache__/version.cpython-38.pyc,,
-pip/_vendor/packaging/_compat.py,sha256=MXdsGpSE_W-ZrHoC87andI4LV2FAwU7HLL-eHe_CjhU,1128
-pip/_vendor/packaging/_structures.py,sha256=ozkCX8Q8f2qE1Eic3YiQ4buDVfgz2iYevY9e7R2y3iY,2022
-pip/_vendor/packaging/_typing.py,sha256=VgA0AAvsc97KB5nF89zoudOyCMEsV7FlaXzZbYqEkzA,1824
-pip/_vendor/packaging/markers.py,sha256=V_RdoQqOUbSfy7y9o2vRk7BkzAh3yneC82cuWpKrqOg,9491
-pip/_vendor/packaging/requirements.py,sha256=F93hkn7i8NKRZP-FtdTIlhz1PUsRjhe6eRbsBXX0Uh4,4903
-pip/_vendor/packaging/specifiers.py,sha256=uYp9l13F0LcknS6d4N60ytiBgFmIhKideOq9AnsxTco,31944
-pip/_vendor/packaging/tags.py,sha256=NKMS37Zo_nWrZxgsD6zbXsXgc9edn9m160cBiLmHJdE,24067
-pip/_vendor/packaging/utils.py,sha256=RShlvnjO2CtYSD8uri32frMMFMTmB-3ihsq1-ghzLEw,1811
-pip/_vendor/packaging/version.py,sha256=Cnbm-OO9D_qd8ZTFxzFcjSavexSYFZmyeaoPvMsjgPc,15470
-pip/_vendor/pep517/__init__.py,sha256=r5uA106NGJa3slspaD2m32aFpFUiZX-mZ9vIlzAEOp4,84
-pip/_vendor/pep517/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/_in_process.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/build.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/check.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/colorlog.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/compat.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/dirtools.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/envbuild.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/meta.cpython-38.pyc,,
-pip/_vendor/pep517/__pycache__/wrappers.cpython-38.pyc,,
-pip/_vendor/pep517/_in_process.py,sha256=XrKOTURJdia5R7i3i_OQmS89LASFXE3HQXfX63qZBIE,8438
-pip/_vendor/pep517/build.py,sha256=DN4ouyj_bd00knOKqv0KHRtN0-JezJoNNZQmcDi4juk,3335
-pip/_vendor/pep517/check.py,sha256=YoaNE3poJGpz96biVCYwtcDshwEGE2HRU5KKya9yfpY,5961
-pip/_vendor/pep517/colorlog.py,sha256=Tk9AuYm_cLF3BKTBoSTJt9bRryn0aFojIQOwbfVUTxQ,4098
-pip/_vendor/pep517/compat.py,sha256=M-5s4VNp8rjyT76ZZ_ibnPD44DYVzSQlyCEHayjtDPw,780
-pip/_vendor/pep517/dirtools.py,sha256=2mkAkAL0mRz_elYFjRKuekTJVipH1zTn4tbf1EDev84,1129
-pip/_vendor/pep517/envbuild.py,sha256=szKUFlO50X1ahQfXwz4hD9V2VE_bz9MLVPIeidsFo4w,6041
-pip/_vendor/pep517/meta.py,sha256=8mnM5lDnT4zXQpBTliJbRGfesH7iioHwozbDxALPS9Y,2463
-pip/_vendor/pep517/wrappers.py,sha256=yFU4Lp7TIYbmuVOTY-pXnlyGZ3F_grIi-JlLkpGN8Gk,10783
-pip/_vendor/pkg_resources/__init__.py,sha256=XpGBfvS9fafA6bm5rx7vnxdxs7yqyoc_NnpzKApkJ64,108277
-pip/_vendor/pkg_resources/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/pkg_resources/__pycache__/py31compat.cpython-38.pyc,,
-pip/_vendor/pkg_resources/py31compat.py,sha256=CRk8fkiPRDLsbi5pZcKsHI__Pbmh_94L8mr9Qy9Ab2U,562
-pip/_vendor/progress/__init__.py,sha256=fcbQQXo5np2CoQyhSH5XprkicwLZNLePR3uIahznSO0,4857
-pip/_vendor/progress/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/progress/__pycache__/bar.cpython-38.pyc,,
-pip/_vendor/progress/__pycache__/counter.cpython-38.pyc,,
-pip/_vendor/progress/__pycache__/spinner.cpython-38.pyc,,
-pip/_vendor/progress/bar.py,sha256=QuDuVNcmXgpxtNtxO0Fq72xKigxABaVmxYGBw4J3Z_E,2854
-pip/_vendor/progress/counter.py,sha256=MznyBrvPWrOlGe4MZAlGUb9q3aODe6_aNYeAE_VNoYA,1372
-pip/_vendor/progress/spinner.py,sha256=k8JbDW94T0-WXuXfxZIFhdoNPYp3jfnpXqBnfRv5fGs,1380
-pip/_vendor/pyparsing.py,sha256=J1b4z3S_KwyJW7hKGnoN-hXW9pgMIzIP6QThyY5yJq4,273394
-pip/_vendor/requests/__init__.py,sha256=orzv4-1uejMDc2v3LnTVneINGXiwqXSfrASoFBsYblE,4465
-pip/_vendor/requests/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/__version__.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/_internal_utils.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/adapters.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/api.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/auth.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/certs.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/compat.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/cookies.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/exceptions.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/help.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/hooks.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/models.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/packages.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/sessions.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/status_codes.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/structures.cpython-38.pyc,,
-pip/_vendor/requests/__pycache__/utils.cpython-38.pyc,,
-pip/_vendor/requests/__version__.py,sha256=Xwky1FMlMkJJGidBM50JC7FKcosWzkjIW-WhQGrBdFM,441
-pip/_vendor/requests/_internal_utils.py,sha256=Zx3PnEUccyfsB-ie11nZVAW8qClJy0gx1qNME7rgT18,1096
-pip/_vendor/requests/adapters.py,sha256=e-bmKEApNVqFdylxuMJJfiaHdlmS_zhWhIMEzlHvGuc,21548
-pip/_vendor/requests/api.py,sha256=PlHM-HT3PQ5lyufoeGmV-nJxRi7UnUyGVh7OV7B9XV4,6496
-pip/_vendor/requests/auth.py,sha256=OMoJIVKyRLy9THr91y8rxysZuclwPB-K1Xg1zBomUhQ,10207
-pip/_vendor/requests/certs.py,sha256=nXRVq9DtGmv_1AYbwjTu9UrgAcdJv05ZvkNeaoLOZxY,465
-pip/_vendor/requests/compat.py,sha256=LQWuCR4qXk6w7-qQopXyz0WNHUdAD40k0mKnaAEf1-g,2045
-pip/_vendor/requests/cookies.py,sha256=Y-bKX6TvW3FnYlE6Au0SXtVVWcaNdFvuAwQxw-G0iTI,18430
-pip/_vendor/requests/exceptions.py,sha256=d9fJJw8YFBB9VzG9qhvxLuOx6be3c_Dwbck-dVUEAcs,3173
-pip/_vendor/requests/help.py,sha256=SJPVcoXeo7KfK4AxJN5eFVQCjr0im87tU2n7ubLsksU,3578
-pip/_vendor/requests/hooks.py,sha256=QReGyy0bRcr5rkwCuObNakbYsc7EkiKeBwG4qHekr2Q,757
-pip/_vendor/requests/models.py,sha256=_tKIbrscbGvaTdX1UHCwRaiYmPF9VBIuBeydr4Qx1Tg,34287
-pip/_vendor/requests/packages.py,sha256=njJmVifY4aSctuW3PP5EFRCxjEwMRDO6J_feG2dKWsI,695
-pip/_vendor/requests/sessions.py,sha256=OBtwQs1vjkB1xamFdi_p5y8BVeX16BJoQcwSwx_Y3fI,29316
-pip/_vendor/requests/status_codes.py,sha256=gT79Pbs_cQjBgp-fvrUgg1dn2DQO32bDj4TInjnMPSc,4188
-pip/_vendor/requests/structures.py,sha256=msAtr9mq1JxHd-JRyiILfdFlpbJwvvFuP3rfUQT_QxE,3005
-pip/_vendor/requests/utils.py,sha256=VBs99cvV8Z29WGXeWZqHzZ80_nu1AwwjYzJfe0wQIvs,30176
-pip/_vendor/resolvelib/__init__.py,sha256=sqMOy4CbVJQiaG9bCPj0oAntGAVy-RWdPfVaC9XDIEQ,537
-pip/_vendor/resolvelib/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/resolvelib/__pycache__/providers.cpython-38.pyc,,
-pip/_vendor/resolvelib/__pycache__/reporters.cpython-38.pyc,,
-pip/_vendor/resolvelib/__pycache__/resolvers.cpython-38.pyc,,
-pip/_vendor/resolvelib/__pycache__/structs.cpython-38.pyc,,
-pip/_vendor/resolvelib/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_vendor/resolvelib/compat/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/resolvelib/compat/__pycache__/collections_abc.cpython-38.pyc,,
-pip/_vendor/resolvelib/compat/collections_abc.py,sha256=mtTkpr3Gf3OGvU1PD8YuvrJRhVbioxV82T-niFPoX3o,127
-pip/_vendor/resolvelib/providers.py,sha256=TZDCmL-Ic-R5JRIZY8G4FLG5xB2343B0DfuK7aw2Yqw,4547
-pip/_vendor/resolvelib/reporters.py,sha256=ZPSJnVfK8WvXTbX8jE0Nren0-_Hg9ym4epCUPtU8Y0U,1405
-pip/_vendor/resolvelib/resolvers.py,sha256=lQTGcc-2fgHbmdiLzeNDUxVmGc5ZFjkAL6JrVqnqJIw,15018
-pip/_vendor/resolvelib/structs.py,sha256=yrdhd-n7DercimPGclXe20rgqhlxw8PnxC0wmcXO19Y,2016
-pip/_vendor/retrying.py,sha256=k3fflf5_Mm0XcIJYhB7Tj34bqCCPhUDkYbx1NvW2FPE,9972
-pip/_vendor/six.py,sha256=U4Z_yv534W5CNyjY9i8V1OXY2SjAny8y2L5vDLhhThM,34159
-pip/_vendor/toml/__init__.py,sha256=rJ1pu933HgUtyeeNiusoPd5jJOPNhaKHhSSld3o8AQo,747
-pip/_vendor/toml/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/toml/__pycache__/common.cpython-38.pyc,,
-pip/_vendor/toml/__pycache__/decoder.cpython-38.pyc,,
-pip/_vendor/toml/__pycache__/encoder.cpython-38.pyc,,
-pip/_vendor/toml/__pycache__/ordered.cpython-38.pyc,,
-pip/_vendor/toml/__pycache__/tz.cpython-38.pyc,,
-pip/_vendor/toml/common.py,sha256=ViBccAduP6eZNJAb1POhRhjOAi56TDsNgWJ1TjgXAug,242
-pip/_vendor/toml/decoder.py,sha256=atpXmyFCzNGiqhkcYLySBuJQkPeSHDzBz47sEaX1amw,38696
-pip/_vendor/toml/encoder.py,sha256=fPqLyFdPAam17X9SELz2TMp9affkfHCmgWZxRKcmzhY,9955
-pip/_vendor/toml/ordered.py,sha256=UWt5Eka90IWVBYdvLgY5PXnkBcVYpHjnw9T67rM85T8,378
-pip/_vendor/toml/tz.py,sha256=DrAgI3wZxZiGcLuV_l8ueA_nPrYoxQ3hZA9tJSjWRsQ,618
-pip/_vendor/urllib3/__init__.py,sha256=rdFZCO1L7e8861ZTvo8AiSKwxCe9SnWQUQwJ599YV9c,2683
-pip/_vendor/urllib3/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/_collections.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/connection.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/connectionpool.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/exceptions.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/fields.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/filepost.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/poolmanager.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/request.cpython-38.pyc,,
-pip/_vendor/urllib3/__pycache__/response.cpython-38.pyc,,
-pip/_vendor/urllib3/_collections.py,sha256=GouVsNzwg6jADZTmimMI6oqmwKSswnMo9dh5tGNVWO4,10792
-pip/_vendor/urllib3/connection.py,sha256=Fln8a_bkegdNMkFoSOwyI0PJvL1OqzVUO6ifihKOTpc,14461
-pip/_vendor/urllib3/connectionpool.py,sha256=egdaX-Db_LVXifDxv3JY0dHIpQqDv0wC0_9Eeh8FkPM,35725
-pip/_vendor/urllib3/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_vendor/urllib3/contrib/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/__pycache__/_appengine_environ.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/__pycache__/appengine.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/__pycache__/ntlmpool.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/__pycache__/pyopenssl.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/__pycache__/securetransport.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/__pycache__/socks.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/_appengine_environ.py,sha256=bDbyOEhW2CKLJcQqAKAyrEHN-aklsyHFKq6vF8ZFsmk,957
-pip/_vendor/urllib3/contrib/_securetransport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_vendor/urllib3/contrib/_securetransport/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/_securetransport/__pycache__/bindings.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/_securetransport/__pycache__/low_level.cpython-38.pyc,,
-pip/_vendor/urllib3/contrib/_securetransport/bindings.py,sha256=mullWYFaghBdRWla6HYU-TBgFRTPLBEfxj3jplbeJmQ,16886
-pip/_vendor/urllib3/contrib/_securetransport/low_level.py,sha256=V7GnujxnWZh2N2sMsV5N4d9Imymokkm3zBwgt77_bSE,11956
-pip/_vendor/urllib3/contrib/appengine.py,sha256=gfdK4T7CRin7v9HRhHDbDh-Hbk66hHDWeoz7nV3PJo8,11034
-pip/_vendor/urllib3/contrib/ntlmpool.py,sha256=a402AwGN_Ll3N-4ur_AS6UrU-ycUtlnYqoBF76lORg8,4160
-pip/_vendor/urllib3/contrib/pyopenssl.py,sha256=9gm5kpC0ScbDCWobeCrh5LDqS8HgU8FNhmk5v8qQ5Bs,16582
-pip/_vendor/urllib3/contrib/securetransport.py,sha256=vBDFjSnH2gWa-ztMKVaiwW46K1mlDZKqvo_VAonfdcY,32401
-pip/_vendor/urllib3/contrib/socks.py,sha256=nzDMgDIFJWVubKHqvIn2-SKCO91hhJInP92WgHChGzA,7036
-pip/_vendor/urllib3/exceptions.py,sha256=D2Jvab7M7m_n0rnmBmq481paoVT32VvVeB6VeQM0y-w,7172
-pip/_vendor/urllib3/fields.py,sha256=kroD76QK-GdHHW7f_AUN4XxDC3OQPI2FFrS9eSL4BCs,8553
-pip/_vendor/urllib3/filepost.py,sha256=vj0qbrpT1AFzvvW4SuC8M5kJiw7wftHcSr-7b8UpPpw,2440
-pip/_vendor/urllib3/packages/__init__.py,sha256=h4BLhD4tLaBx1adaDtKXfupsgqY0wWLXb_f1_yVlV6A,108
-pip/_vendor/urllib3/packages/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/urllib3/packages/__pycache__/six.cpython-38.pyc,,
-pip/_vendor/urllib3/packages/backports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pip/_vendor/urllib3/packages/backports/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/urllib3/packages/backports/__pycache__/makefile.cpython-38.pyc,,
-pip/_vendor/urllib3/packages/backports/makefile.py,sha256=005wrvH-_pWSnTFqQ2sdzzh4zVCtQUUQ4mR2Yyxwc0A,1418
-pip/_vendor/urllib3/packages/six.py,sha256=adx4z-eM_D0Vvu0IIqVzFACQ_ux9l64y7DkSEfbxCDs,32536
-pip/_vendor/urllib3/packages/ssl_match_hostname/__init__.py,sha256=ywgKMtfHi1-DrXlzPfVAhzsLzzqcK7GT6eLgdode1Fg,688
-pip/_vendor/urllib3/packages/ssl_match_hostname/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/urllib3/packages/ssl_match_hostname/__pycache__/_implementation.cpython-38.pyc,,
-pip/_vendor/urllib3/packages/ssl_match_hostname/_implementation.py,sha256=rvQDQviqQLtPJB6MfEgABnBFj3nXft7ZJ3Dx-BC0AQY,5696
-pip/_vendor/urllib3/poolmanager.py,sha256=iWEAIGrVNGoOmQyfiFwCqG-IyYy6GIQ-jJ9QCsX9li4,17861
-pip/_vendor/urllib3/request.py,sha256=hhoHvEEatyd9Tn5EbGjQ0emn-ENMCyY591yNWTneINA,6018
-pip/_vendor/urllib3/response.py,sha256=eo1Sfkn2x44FtjgP3qwwDsG9ak84spQAxEGy7Ovd4Pc,28221
-pip/_vendor/urllib3/util/__init__.py,sha256=bWNaav_OT-1L7-sxm59cGb59rDORlbhb_4noduM5m0U,1038
-pip/_vendor/urllib3/util/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/connection.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/queue.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/request.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/response.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/retry.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/ssl_.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/timeout.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/url.cpython-38.pyc,,
-pip/_vendor/urllib3/util/__pycache__/wait.cpython-38.pyc,,
-pip/_vendor/urllib3/util/connection.py,sha256=NsxUAKQ98GKywta--zg57CdVpeTCI6N-GElCq78Dl8U,4637
-pip/_vendor/urllib3/util/queue.py,sha256=myTX3JDHntglKQNBf3b6dasHH-uF-W59vzGSQiFdAfI,497
-pip/_vendor/urllib3/util/request.py,sha256=C-6-AWffxZG03AdRGoY59uqsn4CVItKU6gjxz7Hc3Mc,3815
-pip/_vendor/urllib3/util/response.py,sha256=_WbTQr8xRQuJuY2rTIZxVdJD6mnEOtQupjaK_bF_Vj8,2573
-pip/_vendor/urllib3/util/retry.py,sha256=3wbv7SdzYNOxPcBiFkPCubTbK1_6vWSepznOXirhUfA,15543
-pip/_vendor/urllib3/util/ssl_.py,sha256=N7gqt2iqzKBsWGmc61YeKNSPri6Ns2iZ_MD5hV2y8tU,14523
-pip/_vendor/urllib3/util/timeout.py,sha256=3qawUo-TZq4q7tyeRToMIOdNGEOBjOOQVq7nHnLryP4,9947
-pip/_vendor/urllib3/util/url.py,sha256=S4YyAwWKJPjFFECC7l9Vp9EKqRH1XAb-uQFANn1Tak0,13981
-pip/_vendor/urllib3/util/wait.py,sha256=k46KzqIYu3Vnzla5YW3EvtInNlU_QycFqQAghIOxoAg,5406
-pip/_vendor/vendor.txt,sha256=bWUiaRjMJhuUsqFZHEJkBH_6lJ_Avl9cOyszcI74IHs,437
-pip/_vendor/webencodings/__init__.py,sha256=qOBJIuPy_4ByYH6W_bNgJF-qYQ2DoU-dKsDu5yRWCXg,10579
-pip/_vendor/webencodings/__pycache__/__init__.cpython-38.pyc,,
-pip/_vendor/webencodings/__pycache__/labels.cpython-38.pyc,,
-pip/_vendor/webencodings/__pycache__/mklabels.cpython-38.pyc,,
-pip/_vendor/webencodings/__pycache__/tests.cpython-38.pyc,,
-pip/_vendor/webencodings/__pycache__/x_user_defined.cpython-38.pyc,,
-pip/_vendor/webencodings/labels.py,sha256=4AO_KxTddqGtrL9ns7kAPjb0CcN6xsCIxbK37HY9r3E,8979
-pip/_vendor/webencodings/mklabels.py,sha256=GYIeywnpaLnP0GSic8LFWgd0UVvO_l1Nc6YoF-87R_4,1305
-pip/_vendor/webencodings/tests.py,sha256=OtGLyjhNY1fvkW1GvLJ_FV9ZoqC9Anyjr7q3kxTbzNs,6563
-pip/_vendor/webencodings/x_user_defined.py,sha256=yOqWSdmpytGfUgh_Z6JYgDNhoc-BAHyyeeT15Fr42tM,4307
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/REQUESTED
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/REQUESTED
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/WHEEL
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/WHEEL
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.35.1)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/entry_points.txt
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/entry_points.txt
@@ -1,5 +0,0 @@
-[console_scripts]
-pip = pip._internal.cli.main:main
-pip3 = pip._internal.cli.main:main
-pip3.8 = pip._internal.cli.main:main
-
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/top_level.txt
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip-20.2.3.dist-info/top_level.txt
@@ -1 +0,0 @@
-pip
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/init.py
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/init.py
@@ -1,18 +0,0 @@
-from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-
-if MYPY_CHECK_RUNNING:
-    from typing import List, Optional
-
-
-__version__ = "20.2.3"
-
-
-def main(args=None):
-    # type: (Optional[List[str]]) -> int
-    """This is an internal API only meant for use by pip's own console scripts.
-
-    For additional details, see https://github.com/pypa/pip/issues/7498.
-    """
-    from pip._internal.utils.entrypoints import _wrapper
-
-    return _wrapper(args)
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/main.py
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/main.py
@@ -1,26 +0,0 @@
-from __future__ import absolute_import
-
-import os
-import sys
-
-# Remove '' and current working directory from the first entry
-# of sys.path, if present to avoid using current directory
-# in pip commands check, freeze, install, list and show,
-# when invoked as python -m pip <command>
-if sys.path[0] in ('', os.getcwd()):
-    sys.path.pop(0)
-
-# If we are running from a wheel, add the wheel to sys.path
-# This allows the usage python pip-*.whl/pip install pip-*.whl
-if __package__ == '':
-    # __file__ is pip-*.whl/pip/__main__.py
-    # first dirname call strips of '/__main__.py', second strips off '/pip'
-    # Resulting path is the name of the wheel itself
-    # Add that to sys.path so we can import pip
-    path = os.path.dirname(os.path.dirname(__file__))
-    sys.path.insert(0, path)
-
-from pip._internal.cli.main import main as _main  # isort:skip # noqa
-
-if __name__ == '__main__':
-    sys.exit(_main())
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/_internal/init.py
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/_internal/init.py
@@ -1,17 +0,0 @@
-import pip._internal.utils.inject_securetransport  # noqa
-from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-
-if MYPY_CHECK_RUNNING:
-    from typing import Optional, List
-
-
-def main(args=None):
-    # type: (Optional[List[str]]) -> int
-    """This is preserved for old console scripts that may still be referencing
-    it.
-
-    For additional details, see https://github.com/pypa/pip/issues/7498.
-    """
-    from pip._internal.utils.entrypoints import _wrapper
-
-    return _wrapper(args)
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/_internal/build_env.py
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/_internal/build_env.py
@@ -1,241 +0,0 @@
-"""Build Environment used for isolation during sdist building
-"""
-
-import logging
-import os
-import sys
-import textwrap
-from collections import OrderedDict
-from distutils.sysconfig import get_python_lib
-from sysconfig import get_paths
-
-from pip._vendor.pkg_resources import Requirement, VersionConflict, WorkingSet
-
-from pip import __file__ as pip_location
-from pip._internal.cli.spinners import open_spinner
-from pip._internal.utils.subprocess import call_subprocess
-from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds
-from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-
-if MYPY_CHECK_RUNNING:
-    from types import TracebackType
-    from typing import Tuple, Set, Iterable, Optional, List, Type
-    from pip._internal.index.package_finder import PackageFinder
-
-logger = logging.getLogger(__name__)
-
-
-class _Prefix:
-
-    def __init__(self, path):
-        # type: (str) -> None
-        self.path = path
-        self.setup = False
-        self.bin_dir = get_paths(
-            'nt' if os.name == 'nt' else 'posix_prefix',
-            vars={'base': path, 'platbase': path}
-        )['scripts']
-        # Note: prefer distutils' sysconfig to get the
-        # library paths so PyPy is correctly supported.
-        purelib = get_python_lib(plat_specific=False, prefix=path)
-        platlib = get_python_lib(plat_specific=True, prefix=path)
-        if purelib == platlib:
-            self.lib_dirs = [purelib]
-        else:
-            self.lib_dirs = [purelib, platlib]
-
-
-class BuildEnvironment(object):
-    """Creates and manages an isolated environment to install build deps
-    """
-
-    def __init__(self):
-        # type: () -> None
-        temp_dir = TempDirectory(
-            kind=tempdir_kinds.BUILD_ENV, globally_managed=True
-        )
-
-        self._prefixes = OrderedDict((
-            (name, _Prefix(os.path.join(temp_dir.path, name)))
-            for name in ('normal', 'overlay')
-        ))
-
-        self._bin_dirs = []  # type: List[str]
-        self._lib_dirs = []  # type: List[str]
-        for prefix in reversed(list(self._prefixes.values())):
-            self._bin_dirs.append(prefix.bin_dir)
-            self._lib_dirs.extend(prefix.lib_dirs)
-
-        # Customize site to:
-        # - ensure .pth files are honored
-        # - prevent access to system site packages
-        system_sites = {
-            os.path.normcase(site) for site in (
-                get_python_lib(plat_specific=False),
-                get_python_lib(plat_specific=True),
-            )
-        }
-        self._site_dir = os.path.join(temp_dir.path, 'site')
-        if not os.path.exists(self._site_dir):
-            os.mkdir(self._site_dir)
-        with open(os.path.join(self._site_dir, 'sitecustomize.py'), 'w') as fp:
-            fp.write(textwrap.dedent(
-                '''
-                import os, site, sys
-
-                # First, drop system-sites related paths.
-                original_sys_path = sys.path[:]
-                known_paths = set()
-                for path in {system_sites!r}:
-                    site.addsitedir(path, known_paths=known_paths)
-                system_paths = set(
-                    os.path.normcase(path)
-                    for path in sys.path[len(original_sys_path):]
-                )
-                original_sys_path = [
-                    path for path in original_sys_path
-                    if os.path.normcase(path) not in system_paths
-                ]
-                sys.path = original_sys_path
-
-                # Second, add lib directories.
-                # ensuring .pth file are processed.
-                for path in {lib_dirs!r}:
-                    assert not path in sys.path
-                    site.addsitedir(path)
-                '''
-            ).format(system_sites=system_sites, lib_dirs=self._lib_dirs))
-
-    def __enter__(self):
-        # type: () -> None
-        self._save_env = {
-            name: os.environ.get(name, None)
-            for name in ('PATH', 'PYTHONNOUSERSITE', 'PYTHONPATH')
-        }
-
-        path = self._bin_dirs[:]
-        old_path = self._save_env['PATH']
-        if old_path:
-            path.extend(old_path.split(os.pathsep))
-
-        pythonpath = [self._site_dir]
-
-        os.environ.update({
-            'PATH': os.pathsep.join(path),
-            'PYTHONNOUSERSITE': '1',
-            'PYTHONPATH': os.pathsep.join(pythonpath),
-        })
-
-    def __exit__(
-        self,
-        exc_type,  # type: Optional[Type[BaseException]]
-        exc_val,  # type: Optional[BaseException]
-        exc_tb  # type: Optional[TracebackType]
-    ):
-        # type: (...) -> None
-        for varname, old_value in self._save_env.items():
-            if old_value is None:
-                os.environ.pop(varname, None)
-            else:
-                os.environ[varname] = old_value
-
-    def check_requirements(self, reqs):
-        # type: (Iterable[str]) -> Tuple[Set[Tuple[str, str]], Set[str]]
-        """Return 2 sets:
-            - conflicting requirements: set of (installed, wanted) reqs tuples
-            - missing requirements: set of reqs
-        """
-        missing = set()
-        conflicting = set()
-        if reqs:
-            ws = WorkingSet(self._lib_dirs)
-            for req in reqs:
-                try:
-                    if ws.find(Requirement.parse(req)) is None:
-                        missing.add(req)
-                except VersionConflict as e:
-                    conflicting.add((str(e.args[0].as_requirement()),
-                                     str(e.args[1])))
-        return conflicting, missing
-
-    def install_requirements(
-        self,
-        finder,  # type: PackageFinder
-        requirements,  # type: Iterable[str]
-        prefix_as_string,  # type: str
-        message  # type: str
-    ):
-        # type: (...) -> None
-        prefix = self._prefixes[prefix_as_string]
-        assert not prefix.setup
-        prefix.setup = True
-        if not requirements:
-            return
-        args = [
-            sys.executable, os.path.dirname(pip_location), 'install',
-            '--ignore-installed', '--no-user', '--prefix', prefix.path,
-            '--no-warn-script-location',
-        ]  # type: List[str]
-        if logger.getEffectiveLevel() <= logging.DEBUG:
-            args.append('-v')
-        for format_control in ('no_binary', 'only_binary'):
-            formats = getattr(finder.format_control, format_control)
-            args.extend(('--' + format_control.replace('_', '-'),
-                         ','.join(sorted(formats or {':none:'}))))
-
-        index_urls = finder.index_urls
-        if index_urls:
-            args.extend(['-i', index_urls[0]])
-            for extra_index in index_urls[1:]:
-                args.extend(['--extra-index-url', extra_index])
-        else:
-            args.append('--no-index')
-        for link in finder.find_links:
-            args.extend(['--find-links', link])
-
-        for host in finder.trusted_hosts:
-            args.extend(['--trusted-host', host])
-        if finder.allow_all_prereleases:
-            args.append('--pre')
-        if finder.prefer_binary:
-            args.append('--prefer-binary')
-        args.append('--')
-        args.extend(requirements)
-        with open_spinner(message) as spinner:
-            call_subprocess(args, spinner=spinner)
-
-
-class NoOpBuildEnvironment(BuildEnvironment):
-    """A no-op drop-in replacement for BuildEnvironment
-    """
-
-    def __init__(self):
-        # type: () -> None
-        pass
-
-    def __enter__(self):
-        # type: () -> None
-        pass
-
-    def __exit__(
-        self,
-        exc_type,  # type: Optional[Type[BaseException]]
-        exc_val,  # type: Optional[BaseException]
-        exc_tb  # type: Optional[TracebackType]
-    ):
-        # type: (...) -> None
-        pass
-
-    def cleanup(self):
-        # type: () -> None
-        pass
-
-    def install_requirements(
-        self,
-        finder,  # type: PackageFinder
-        requirements,  # type: Iterable[str]
-        prefix_as_string,  # type: str
-        message  # type: str
-    ):
-        # type: (...) -> None
-        raise NotImplementedError()
--- a/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/_internal/cache.py
+++ b/contracts/custodial/.custodial/lib/python3.8/site-packages/pip/_internal/cache.py
@@ -1,346 +0,0 @@
-"""Cache Management
-"""
-
-import hashlib
-import json
-import logging
-import os
-
-from pip._vendor.packaging.tags import interpreter_name, interpreter_version
-from pip._vendor.packaging.utils import canonicalize_name
-
-from pip._internal.exceptions import InvalidWheelFilename
-from pip._internal.models.link import Link
-from pip._internal.models.wheel import Wheel
-from pip._internal.utils.temp_dir import TempDirectory, tempdir_kinds
-from pip._internal.utils.typing import MYPY_CHECK_RUNNING
-from pip._internal.utils.urls import path_to_url
-
-if MYPY_CHECK_RUNNING:
-    from typing import Optional, Set, List, Any, Dict
-
-    from pip._vendor.packaging.tags import Tag
-
-    from pip._internal.models.format_control import FormatControl
-
-logger = logging.getLogger(__name__)
-
-
-def _hash_dict(d):
-    # type: (Dict[str, str]) -> str
-    """Return a stable sha224 of a dictionary."""
-    s = json.dumps(d, sort_keys=True, separators=(",", ":"), ensure_ascii=True)
-    return hashlib.sha224(s.encode("ascii")).hexdigest()
-
-
-class Cache(object):
-    """An abstract class - provides cache directories for data from links
-
-
-        :param cache_dir: The root of the cache.
-        :param format_control: An object of FormatControl class to limit
-            binaries being read from the cache.
-        :param allowed_formats: which formats of files the cache should store.
-            ('binary' and 'source' are the only allowed values)
-    """
-
-    def __init__(self, cache_dir, format_control, allowed_formats):
-        # type: (str, FormatControl, Set[str]) -> None
-        super(Cache, self).__init__()
-        assert not cache_dir or os.path.isabs(cache_dir)
-        self.cache_dir = cache_dir or None
-        self.format_control = format_control
-        self.allowed_formats = allowed_formats
-
-        _valid_formats = {"source", "binary"}
-        assert self.allowed_formats.union(_valid_formats) == _valid_formats
-
-    def _get_cache_path_parts_legacy(self, link):
-        # type: (Link) -> List[str]
-        """Get parts of part that must be os.path.joined with cache_dir
-
-        Legacy cache key (pip < 20) for compatibility with older caches.
-        """
-
-        # We want to generate an url to use as our cache key, we don't want to
-        # just re-use the URL because it might have other items in the fragment
-        # and we don't care about those.
-        key_parts = [link.url_without_fragment]
-        if link.hash_name is not None and link.hash is not None:
-            key_parts.append("=".join([link.hash_name, link.hash]))
-        key_url = "#".join(key_parts)
-
-        # Encode our key url with sha224, we'll use this because it has similar
-        # security properties to sha256, but with a shorter total output (and
-        # thus less secure). However the differences don't make a lot of
-        # difference for our use case here.
-        hashed = hashlib.sha224(key_url.encode()).hexdigest()
-
-        # We want to nest the directories some to prevent having a ton of top
-        # level directories where we might run out of sub directories on some
-        # FS.
-        parts = [hashed[:2], hashed[2:4], hashed[4:6], hashed[6:]]
-
-        return parts
-
-    def _get_cache_path_parts(self, link):
-        # type: (Link) -> List[str]
-        """Get parts of part that must be os.path.joined with cache_dir
-        """
-
-        # We want to generate an url to use as our cache key, we don't want to
-        # just re-use the URL because it might have other items in the fragment
-        # and we don't care about those.
-        key_parts = {"url": link.url_without_fragment}
-        if link.hash_name is not None and link.hash is not None:
-            key_parts[link.hash_name] = link.hash
-        if link.subdirectory_fragment:
-            key_parts["subdirectory"] = link.subdirectory_fragment
-
-        # Include interpreter name, major and minor version in cache key
-        # to cope with ill-behaved sdists that build a different wheel
-        # depending on the python version their setup.py is being run on,
-        # and don't encode the difference in compatibility tags.
-        # https://github.com/pypa/pip/issues/7296
-        key_parts["interpreter_name"] = interpreter_name()
-        key_parts["interpreter_version"] = interpreter_version()
-
-        # Encode our key url with sha224, we'll use this because it has similar
-        # security properties to sha256, but with a shorter total output (and
-        # thus less secure). However the differences don't make a lot of
-        # difference for our use case here.
-        hashed = _hash_dict(key_parts)
-
-        # We want to nest the directories some to prevent having a ton of top
-        # level directories where we might run out of sub directories on some
-        # FS.
-        parts = [hashed[:2], hashed[2:4], hashed[4:6], hashed[6:]]
-
-        return parts
-
-    def _get_candidates(self, link, canonical_package_name):
-        # type: (Link, str) -> List[Any]
-        can_not_cache = (
-            not self.cache_dir or
-            not canonical_package_name or
-            not link
-        )
-        if can_not_cache:
-            return []
-
-        formats = self.format_control.get_allowed_formats(
-            canonical_package_name
-        )
-        if not self.allowed_formats.intersection(formats):
-            return []
-
-        candidates = []
-        path = self.get_path_for_link(link)
-        if os.path.isdir(path):
-            for candidate in os.listdir(path):
-                candidates.append((candidate, path))
-        # TODO remove legacy path lookup in pip>=21
-        legacy_path = self.get_path_for_link_legacy(link)
-        if os.path.isdir(legacy_path):
-            for candidate in os.listdir(legacy_path):
-                candidates.append((candidate, legacy_path))
-        return candidates
-
-    def get_path_for_link_legacy(self, link):
-        # type: (Link) -> str
-        raise NotImplementedError()
-
-    def get_path_for_link(self, link):
-        # type: (Link) -> str
-        """Return a directory to store cached items in for link.
-        """
-        raise NotImplementedError()
-
-    def get(
-        self,
-        link,            # type: Link
-        package_name,    # type: Optional[str]
-        supported_tags,  # type: List[Tag]
-    ):
-        # type: (...) -> Link
-        """Returns a link to a cached item if it exists, otherwise returns the
-        passed link.
-        """
-        raise NotImplementedError()
-
-
-class SimpleWheelCache(Cache):
-    """A cache of wheels for future installs.
-    """
-
-    def __init__(self, cache_dir, format_control):
-        # type: (str, FormatControl) -> None
-        super(SimpleWheelCache, self).__init__(
-            cache_dir, format_control, {"binary"}
-        )
-
-    def get_path_for_link_legacy(self, link):
-        # type: (Link) -> str
-        parts = self._get_cache_path_parts_legacy(link)
-        assert self.cache_dir
-        return os.path.join(self.cache_dir, "wheels", *parts)
-
-    def get_path_for_link(self, link):
-        # type: (Link) -> str
-        """Return a directory to store cached wheels for link
-
-        Because there are M wheels for any one sdist, we provide a directory
-        to cache them in, and then consult that directory when looking up
-        cache hits.
-
-        We only insert things into the cache if they have plausible version
-        numbers, so that we don't contaminate the cache with things that were
-        not unique. E.g. ./package might have dozens of installs done for it
-        and build a version of 0.0...and if we built and cached a wheel, we'd
-        end up using the same wheel even if the source has been edited.
-
-        :param link: The link of the sdist for which this will cache wheels.
-        """
-        parts = self._get_cache_path_parts(link)
-        assert self.cache_dir
-        # Store wheels within the root cache_dir
-        return os.path.join(self.cache_dir, "wheels", *parts)
-
-    def get(
-        self,
-        link,            # type: Link
-        package_name,    # type: Optional[str]
-        supported_tags,  # type: List[Tag]
-    ):
-        # type: (...) -> Link
-        candidates = []
-
-        if not package_name:
-            return link
-
-        canonical_package_name = canonicalize_name(package_name)
-        for wheel_name, wheel_dir in self._get_candidates(
-            link, canonical_package_name
-        ):
-            try:
-                wheel = Wheel(wheel_name)
-            except InvalidWheelFilename:
-                continue
-            if canonicalize_name(wheel.name) != canonical_package_name:
-                logger.debug(
-                    "Ignoring cached wheel %s for %s as it "
-                    "does not match the expected distribution name %s.",
-                    wheel_name, link, package_name,
-                )
-                continue
-            if not wheel.supported(supported_tags):
-                # Built for a different python/arch/etc
-                continue
-            candidates.append(
-                (
-                    wheel.support_index_min(supported_tags),
-                    wheel_name,
-                    wheel_dir,
-                )
-            )
-
-        if not candidates:
-            return link
-
-        _, wheel_name, wheel_dir = min(candidates)
-        return Link(path_to_url(os.path.join(wheel_dir, wheel_name)))
-
-
-class EphemWheelCache(SimpleWheelCache):
-    """A SimpleWheelCache that creates it's own temporary cache directory
-    """
-
-    def __init__(self, format_control):
-        # type: (FormatControl) -> None
-        self._temp_dir = TempDirectory(
-            kind=tempdir_kinds.EPHEM_WHEEL_CACHE,
-            globally_managed=True,
-        )
-
-        super(EphemWheelCache, self).__init__(
-            self._temp_dir.path, format_control
-        )
-
-
-class CacheEntry(object):
-    def __init__(
-        self,
-        link,  # type: Link
-        persistent,  # type: bool
-    ):
-        self.link = link
-        self.persistent = persistent
-
-
-class WheelCache(Cache):
-    """Wraps EphemWheelCache and SimpleWheelCache into a single Cache
-
-    This Cache allows for gracefully degradation, using the ephem wheel cache
-    when a certain link is not found in the simple wheel cache first.
-    """
-
-    def __init__(self, cache_dir, format_control):
-        # type: (str, FormatControl) -> None
-        super(WheelCache, self).__init__(
-            cache_dir, format_control, {'binary'}
-        )
-        self._wheel_cache = SimpleWheelCache(cache_dir, format_control)
-        self._ephem_cache = EphemWheelCache(format_control)
-
-    def get_path_for_link_legacy(self, link):
-        # type: (Link) -> str
-        return self._wheel_cache.get_path_for_link_legacy(link)
-
-    def get_path_for_link(self, link):
-        # type: (Link) -> str
-        return self._wheel_cache.get_path_for_link(link)
-
-    def get_ephem_path_for_link(self, link):
-        # type: (Link) -> str
-        return self._ephem_cache.get_path_for_link(link)
-
-    def get(
-        self,
-        link,            # type: Link
-        package_name,    # type: Optional[str]
-        supported_tags,  # type: List[Tag]
-    ):
-        # type: (...) -> Link
-        cache_entry = self.get_cache_entry(link, package_name, supported_tags)
-        if cache_entry is None:
-            return link
-        return cache_entry.link
-
-    def get_cache_entry(
-        self,
-        link,            # type: Link
-        package_name,    # type: Optional[str]
-        supported_tags,  # type: List[Tag]
-    ):
-        # type: (...) -> Optional[CacheEntry]
-        """Returns a CacheEntry with a link to a cached item if it exists or
-        None. The cache entry indicates if the item was found in the persistent
-        or ephemeral cache.
-        """
-        retval = self._wheel_cache.get(
-            link=link,
-            package_name=package_name,
-            supported_tags=supported_tags,
-        )
-        if retval is not link:
-            return CacheEntry(retval, persistent=True)
-
-        retval = self._ephem_cache.get(
-            link=link,
-            package_name=package_name,
-            supported_tags=supported_tags,
-        )
-        if retval is not link:
-            return CacheEntry(retval, persistent=False)
-
-        return None
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
nolash	5b8ea95a8e	Bump chainlib to take dynamic arg vector for argparse	2021-09-17 08:12:51 +02:00
nolash	32b15d6d04	Update signer to fill in missing sign to wire symbol	2021-09-15 21:19:05 +02:00
				`@@ -1 +0,0 @@`
				`/Users/blairvanderlugt/.pyenv/versions/3.8.9/bin/python`