Add phone pointer and ussd import verifiers

apps/cic-cache/cic_cache/runnable/daemons/tracker.py

@@ -29,7 +29,6 @@ from hexathon import (
 from chainsyncer.backend import SyncerBackend
 from chainsyncer.driver import (
         HeadSyncer,
-        HistorySyncer,
         )
 from chainsyncer.db.models.base import SessionBase
 
@@ -77,15 +76,13 @@ def main():
 
     if len(syncer_backends) == 0:
         logg.info('found no backends to resume')
-        syncers.append(SyncerBackend.initial(chain_spec, block_offset))
+        syncer_backends.append(SyncerBackend.initial(chain_spec, block_offset))
     else:
         for syncer_backend in syncer_backends:
             logg.info('resuming sync session {}'.format(syncer_backend))
 
-    for syncer_backend in syncer_backends:
-        syncers.append(HistorySyncer(syncer_backend))
+    syncer_backends.append(SyncerBackend.live(chain_spec, block_offset+1))
 
-    syncer_backend = SyncerBackend.live(chain_spec, block_offset+1)
     syncers.append(HeadSyncer(syncer_backend))
 
     trusted_addresses_src = config.get('CIC_TRUST_ADDRESS')

apps/cic-cache/requirements.txt

@@ -1,13 +1,13 @@
-cic-base~=0.1.2a66
+cic-base~=0.1.2a62
 alembic==1.4.2
 confini~=0.3.6rc3
 uwsgi==2.0.19.1
 moolb~=0.1.0
-cic-eth-registry~=0.5.4a13
+cic-eth-registry~=0.5.4a12
 SQLAlchemy==1.3.20
 semver==2.13.0
 psycopg2==2.8.6
 celery==4.4.7
 redis==3.5.3
-chainlib~=0.0.2a10
-chainsyncer[sql]~=0.0.2a1
+chainlib~=0.0.2a5
+chainsyncer~=0.0.1a21

apps/cic-eth/cic_eth/version.py

@@ -10,7 +10,7 @@ version = (
         0,
         11,
         0,
-        'beta.3',
+        'beta.1',
         )
 
 version_object = semver.VersionInfo(

apps/cic-eth/requirements.txt

@@ -1,8 +1,8 @@
-cic-base~=0.1.2a67
+cic-base~=0.1.2a62
 celery==4.4.7
 crypto-dev-signer~=0.4.14a17
 confini~=0.3.6rc3
-cic-eth-registry~=0.5.4a13
+cic-eth-registry~=0.5.4a12
 #cic-bancor~=0.0.6
 redis==3.5.3
 alembic==1.4.2
@@ -18,7 +18,7 @@ moolb~=0.1.1b2
 eth-address-index~=0.1.1a7
 chainlib~=0.0.2a5
 hexathon~=0.0.1a7
-chainsyncer[sql]~=0.0.2a1
+chainsyncer~=0.0.1a21
 chainqueue~=0.0.1a7
 pysha3==1.0.2
 coincurve==15.0.0

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

@@ -11,14 +11,7 @@ REGION=KE
 
 [ussd]
 MENU_FILE=/usr/src/data/ussd_menu.json
-user = 
-pass = 
 
 [statemachine]
 STATES=/usr/src/cic-ussd/states/
 TRANSITIONS=/usr/src/cic-ussd/transitions/
-
-[client]
-host =
-port =
-ssl =

apps/cic-ussd/requirements.txt

@@ -1,4 +1,4 @@
-cic_base[full_graph]~=0.1.2a67
-cic-eth~=0.11.0b3
+cic_base[full_graph]~=0.1.2a61
+cic-eth~=0.11.0b1
 cic-notify~=0.4.0a3
 cic-types~=0.1.0a10

apps/contract-migration/docker/Dockerfile

@@ -57,9 +57,9 @@ WORKDIR /home/grassroots
 USER grassroots
 
 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
-ARG cic_base_version=0.1.2a68
-ARG cic_eth_version=0.11.0b3
-ARG sarafu_faucet_version=0.0.2a20
+ARG cic_base_version=0.1.2a62
+ARG cic_eth_version=0.11.0b1
+ARG sarafu_faucet_version=0.0.2a19
 ARG cic_contracts_version=0.0.2a2
 RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \
 	cic-eth==$cic_eth_version \

apps/contract-migration/reset.sh

@@ -7,17 +7,12 @@ DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUN
 DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
 DEV_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000}
 faucet_amount=${DEV_FAUCET_AMOUNT:-0}
-keystore_file=$()
-DEV_ETH_KEYSTORE_FILE=${DEV_KEYSTORE_FILE:-`realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c`}
-DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=`eth-checksum 0x$(cat $DEV_ETH_KEYSTORE_FILE | jq -r .address)`
-
+keystore_file=$(realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c)
 
 echo "environment:"
 printenv
 echo \n
 
-echo "using wallet address $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER"
-exit 0
 # This is a grassroots team convention for building the Bancor contracts using the bancor protocol repository truffle setup
 # Running this in docker-internal dev container (built from Docker folder in this repo) will write a
 # source-able env file to CIC_DATA_DIR. Services dependent on these contracts can mount this file OR 
@@ -77,13 +72,12 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
 	# Sarafu faucet contract
 	>&2 echo "deploy token faucet contract"
 	DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS`
+	>&2 echo "set token faucet amount"
+	sarafu-faucet-set -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_FAUCET_ADDRESS $faucet_amount
 	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_FAUCET_ADDRESS
 	>&2 echo "set faucet as token minter"
 	giftable-token-minter -w -y $keystore_file -a $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv $DEV_FAUCET_ADDRESS
 
-	>&2 echo "set token faucet amount"
-	sarafu-faucet-set -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_FAUCET_ADDRESS $faucet_amount
-
 
 else
 	echo "\$ETH_PROVIDER not set!"

apps/contract-migration/scripts/cic_eth/import_balance.py

@@ -204,8 +204,8 @@ class Handler:
 #        return b
 
 
-def progress_callback(block_number, tx_index):
-    sys.stdout.write(str(block_number).ljust(200) + "\n")
+def progress_callback(block_number, tx_index, s):
+    sys.stdout.write(str(s).ljust(200) + "\n")
 
 
 
@@ -299,7 +299,7 @@ def main():
     f.close()
 
     syncer_backend.set(block_offset, 0)
-    syncer = HeadSyncer(syncer_backend, block_callback=progress_callback)
+    syncer = HeadSyncer(syncer_backend, progress_callback=progress_callback)
     handler = Handler(conn, chain_spec, user_dir, balances, sarafu_token_address, signer, gas_oracle, nonce_oracle)
     syncer.add_filter(handler)
     syncer.loop(1, conn)

apps/contract-migration/scripts/config/app.ini

@@ -1,24 +0,0 @@
-[app]
-ALLOWED_IP=0.0.0.0/0
-LOCALE_FALLBACK=en
-LOCALE_PATH=/usr/src/cic-ussd/var/lib/locale/
-MAX_BODY_LENGTH=1024
-PASSWORD_PEPPER=QYbzKff6NhiQzY3ygl2BkiKOpER8RE/Upqs/5aZWW+I=
-SERVICE_CODE=*483*46#
-
-[phone_number]
-REGION=KE
-
-[ussd]
-MENU_FILE=/usr/src/data/ussd_menu.json
-user = 
-pass = 
-
-[statemachine]
-STATES=/usr/src/cic-ussd/states/
-TRANSITIONS=/usr/src/cic-ussd/transitions/
-
-[client]
-host =
-port =
-ssl =

apps/contract-migration/scripts/eth/import_balance.py

@@ -204,8 +204,8 @@ class Handler:
 #        return b
 
 
-def progress_callback(block_number, tx_index):
-    sys.stdout.write(str(block_number).ljust(200) + "\n")
+def progress_callback(block_number, tx_index, s):
+    sys.stdout.write(str(s).ljust(200) + "\n")
 
 
 
@@ -299,7 +299,7 @@ def main():
     f.close()
 
     syncer_backend.set(block_offset, 0)
-    syncer = HeadSyncer(syncer_backend, block_callback=progress_callback)
+    syncer = HeadSyncer(syncer_backend, progress_callback=progress_callback)
     handler = Handler(conn, chain_spec, user_dir, balances, sarafu_token_address, signer, gas_oracle, nonce_oracle)
     syncer.add_filter(handler)
     syncer.loop(1, conn)

apps/contract-migration/scripts/package.json

@@ -1,6 +0,0 @@
-{
-  "dependencies": {
-    "cic-client-meta": "^0.0.7-alpha.6",
-    "vcard-parser": "^1.0.0"
-  }
-}

apps/contract-migration/scripts/requirements.txt

@@ -1,5 +1,5 @@
-cic-base[full_graph]==0.1.2a67
-sarafu-faucet==0.0.2a20
-cic-eth==0.11.0b3
+cic-base[full_graph]==0.1.2a61
+sarafu-faucet==0.0.2a17
+cic-eth==0.11.0b1
 cic-types==0.1.0a10
-crypto-dev-signer==0.4.14b1
+crypto-dev-signer==0.4.14a17

apps/contract-migration/scripts/verify.py

@@ -343,13 +343,7 @@ class Verifier:
         address_recovered = json.loads(b.decode('utf-8'))
         address_recovered = address_recovered.replace('"', '')
 
-        try:
-            address = strip_0x(address)
-            address_recovered = strip_0x(address_recovered)
-        except ValueError:
-            raise VerifierError(address_recovered, 'metadata (phone) address {} address recovered {}'.format(address, address_recovered))
-
-        if address != address_recovered:
+        if strip_0x(address) != strip_0x(address_recovered):
             raise VerifierError(address_recovered, 'metadata (phone)')