From c80b8771b940d8d265da18c752afa2d698511ea8 Mon Sep 17 00:00:00 2001 From: Louis Holbrook Date: Wed, 14 Apr 2021 08:17:47 +0000 Subject: [PATCH] Update syncer imports --- apps/cic-eth/cic_eth/version.py | 2 +- apps/cic-eth/requirements.txt | 6 ++--- apps/cic-ussd/.config/app.ini | 7 ++++++ apps/cic-ussd/requirements.txt | 4 ++-- apps/contract-migration/docker/Dockerfile | 2 +- apps/contract-migration/reset.sh | 5 ++-- .../scripts/cic_eth/import_balance.py | 6 ++--- .../contract-migration/scripts/config/app.ini | 24 +++++++++++++++++++ .../scripts/eth/import_balance.py | 6 ++--- apps/contract-migration/scripts/package.json | 6 +++++ .../scripts/requirements.txt | 8 +++---- apps/contract-migration/scripts/verify.py | 8 ++++++- 12 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 apps/contract-migration/scripts/config/app.ini create mode 100644 apps/contract-migration/scripts/package.json diff --git a/apps/cic-eth/cic_eth/version.py b/apps/cic-eth/cic_eth/version.py index c7572135..3fa1d970 100644 --- a/apps/cic-eth/cic_eth/version.py +++ b/apps/cic-eth/cic_eth/version.py @@ -10,7 +10,7 @@ version = ( 0, 11, 0, - 'beta.1', + 'beta.3', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index 73ed26e3..92ce8c4f 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -1,8 +1,8 @@ -cic-base~=0.1.2a62 +cic-base~=0.1.2a67 celery==4.4.7 crypto-dev-signer~=0.4.14a17 confini~=0.3.6rc3 -cic-eth-registry~=0.5.4a12 +cic-eth-registry~=0.5.4a13 #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~=0.0.1a21 +chainsyncer[sql]~=0.0.2a1 chainqueue~=0.0.1a7 pysha3==1.0.2 coincurve==15.0.0 diff --git a/apps/cic-ussd/.config/app.ini b/apps/cic-ussd/.config/app.ini index 5df11153..6d37c421 100644 --- a/apps/cic-ussd/.config/app.ini +++ b/apps/cic-ussd/.config/app.ini @@ -11,7 +11,14 @@ 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 = diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt index 7738c9b6..c002df3b 100644 --- a/apps/cic-ussd/requirements.txt +++ b/apps/cic-ussd/requirements.txt @@ -1,4 +1,4 @@ -cic_base[full_graph]~=0.1.2a61 -cic-eth~=0.11.0b1 +cic_base[full_graph]~=0.1.2a67 +cic-eth~=0.11.0b3 cic-notify~=0.4.0a3 cic-types~=0.1.0a10 diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 8a583ea1..dd2cf26c 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -57,7 +57,7 @@ WORKDIR /home/grassroots USER grassroots ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 -ARG cic_base_version=0.1.2a62 +ARG cic_base_version=0.1.2a67 ARG cic_eth_version=0.11.0b1 ARG sarafu_faucet_version=0.0.2a19 ARG cic_contracts_version=0.0.2a2 diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 0ef9da0e..2d81ae64 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -72,12 +72,13 @@ 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!" diff --git a/apps/contract-migration/scripts/cic_eth/import_balance.py b/apps/contract-migration/scripts/cic_eth/import_balance.py index 618f2421..2067d197 100644 --- a/apps/contract-migration/scripts/cic_eth/import_balance.py +++ b/apps/contract-migration/scripts/cic_eth/import_balance.py @@ -204,8 +204,8 @@ class Handler: # return b -def progress_callback(block_number, tx_index, s): - sys.stdout.write(str(s).ljust(200) + "\n") +def progress_callback(block_number, tx_index): + sys.stdout.write(str(block_number).ljust(200) + "\n") @@ -299,7 +299,7 @@ def main(): f.close() syncer_backend.set(block_offset, 0) - syncer = HeadSyncer(syncer_backend, progress_callback=progress_callback) + syncer = HeadSyncer(syncer_backend, block_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) diff --git a/apps/contract-migration/scripts/config/app.ini b/apps/contract-migration/scripts/config/app.ini new file mode 100644 index 00000000..6d37c421 --- /dev/null +++ b/apps/contract-migration/scripts/config/app.ini @@ -0,0 +1,24 @@ +[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 = diff --git a/apps/contract-migration/scripts/eth/import_balance.py b/apps/contract-migration/scripts/eth/import_balance.py index 618f2421..2067d197 100644 --- a/apps/contract-migration/scripts/eth/import_balance.py +++ b/apps/contract-migration/scripts/eth/import_balance.py @@ -204,8 +204,8 @@ class Handler: # return b -def progress_callback(block_number, tx_index, s): - sys.stdout.write(str(s).ljust(200) + "\n") +def progress_callback(block_number, tx_index): + sys.stdout.write(str(block_number).ljust(200) + "\n") @@ -299,7 +299,7 @@ def main(): f.close() syncer_backend.set(block_offset, 0) - syncer = HeadSyncer(syncer_backend, progress_callback=progress_callback) + syncer = HeadSyncer(syncer_backend, block_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) diff --git a/apps/contract-migration/scripts/package.json b/apps/contract-migration/scripts/package.json new file mode 100644 index 00000000..b5f273d2 --- /dev/null +++ b/apps/contract-migration/scripts/package.json @@ -0,0 +1,6 @@ +{ + "dependencies": { + "cic-client-meta": "^0.0.7-alpha.6", + "vcard-parser": "^1.0.0" + } +} diff --git a/apps/contract-migration/scripts/requirements.txt b/apps/contract-migration/scripts/requirements.txt index 5a62a439..d0ddd1e6 100644 --- a/apps/contract-migration/scripts/requirements.txt +++ b/apps/contract-migration/scripts/requirements.txt @@ -1,5 +1,5 @@ -cic-base[full_graph]==0.1.2a61 -sarafu-faucet==0.0.2a17 -cic-eth==0.11.0b1 +cic-base[full_graph]==0.1.2a67 +sarafu-faucet==0.0.2a20 +cic-eth==0.11.0b3 cic-types==0.1.0a10 -crypto-dev-signer==0.4.14a17 +crypto-dev-signer==0.4.14b1 diff --git a/apps/contract-migration/scripts/verify.py b/apps/contract-migration/scripts/verify.py index e4f51b11..14272ddd 100644 --- a/apps/contract-migration/scripts/verify.py +++ b/apps/contract-migration/scripts/verify.py @@ -343,7 +343,13 @@ class Verifier: address_recovered = json.loads(b.decode('utf-8')) address_recovered = address_recovered.replace('"', '') - if strip_0x(address) != strip_0x(address_recovered): + 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: raise VerifierError(address_recovered, 'metadata (phone)')