diff --git a/apps/cic-eth/cic_eth/api/api_task.py b/apps/cic-eth/cic_eth/api/api_task.py index a92bd501..8522ffbd 100644 --- a/apps/cic-eth/cic_eth/api/api_task.py +++ b/apps/cic-eth/cic_eth/api/api_task.py @@ -6,10 +6,13 @@ # standard imports import logging -# third-party imports +# external imports import celery -from cic_registry.chain import ChainSpec +#from cic_registry.chain import ChainSpec from cic_registry import CICRegistry +from chainlib.chain import ChainSpec + +# local imports from cic_eth.eth.factory import TxFactory from cic_eth.db.enum import LockEnum diff --git a/apps/cic-eth/cic_eth/runnable/create.py b/apps/cic-eth/cic_eth/runnable/create.py index 9ca865f6..8371b0eb 100644 --- a/apps/cic-eth/cic_eth/runnable/create.py +++ b/apps/cic-eth/cic_eth/runnable/create.py @@ -76,8 +76,9 @@ def main(): t = api.create_account(register=register) ps.get_message() - m = ps.get_message(timeout=args.timeout) - print(json.loads(m['data']['result'])) + o = ps.get_message(timeout=args.timeout) + m = json.loads(o['data']) + print(m['result']) if __name__ == '__main__': diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index c53920b9..4d9dc2e6 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -8,7 +8,7 @@ redis==3.5.3 alembic==1.4.2 websockets==8.1 requests~=2.24.0 -eth_accounts_index~=0.0.10a7 +eth_accounts_index~=0.0.10a10 erc20-approval-escrow~=0.3.0a5 erc20-single-shot-faucet~=0.2.0a6 rlp==2.0.1 @@ -18,5 +18,5 @@ eth-gas-proxy==0.0.1a4 websocket-client==0.57.0 moolb~=0.1.1b2 eth-address-index~=0.1.0a8 -chainlib~=0.0.1a12 +chainlib~=0.0.1a16 hexathon~=0.0.1a3 diff --git a/apps/contract-migration/scripts/requirements.txt b/apps/contract-migration/scripts/requirements.txt index c0ad7587..9064b79f 100644 --- a/apps/contract-migration/scripts/requirements.txt +++ b/apps/contract-migration/scripts/requirements.txt @@ -1,7 +1,7 @@ psycopg2==2.8.6 chainlib~=0.0.1a15 chainsyncer~=0.0.1a9 -cic-eth~=0.10.0a28 +cic-eth~=0.10.0a30 cic-registry~=0.5.3a19 confini~=0.3.6rc3 celery==4.4.7 diff --git a/apps/contract-migration/seed_cic_eth.sh b/apps/contract-migration/seed_cic_eth.sh index bb48117a..241ad49d 100644 --- a/apps/contract-migration/seed_cic_eth.sh +++ b/apps/contract-migration/seed_cic_eth.sh @@ -30,7 +30,8 @@ truncate $env_out_file -s 0 set -e set -a -pip install --extra-index-url $DEV_PIP_EXTRA_INDEX_URL cic-eth==0.10.0a29 chainlib==0.0.1a16 +# We need to not install these here... +pip install --extra-index-url $DEV_PIP_EXTRA_INDEX_URL cic-eth==0.10.0a30 chainlib==0.0.1a16 >&2 echo "create account for gas gifter" old_gas_provider=$DEV_ETH_ACCOUNT_GAS_PROVIDER