From d65455fc298a22aaa9a9d0b63ad07c66aafe9858 Mon Sep 17 00:00:00 2001 From: Louis Holbrook Date: Fri, 17 Sep 2021 06:54:58 +0000 Subject: [PATCH] Update signer to fill in missing sign to wire symbol --- apps/cic-eth/cic_eth/cli/rpc.py | 4 ++-- apps/cic-eth/cic_eth/runnable/daemons/tasker.py | 1 - apps/contract-migration/config.sh | 2 +- apps/contract-migration/envlist | 1 + apps/contract-migration/requirements.txt | 4 ++-- apps/contract-migration/reset.sh | 5 +++-- apps/contract-migration/run_job.sh | 2 +- apps/data-seeding/requirements.txt | 4 ++-- docker-compose.yml | 7 ++++--- scripts/dump.sh | 0 10 files changed, 16 insertions(+), 14 deletions(-) mode change 100755 => 100644 scripts/dump.sh diff --git a/apps/cic-eth/cic_eth/cli/rpc.py b/apps/cic-eth/cic_eth/cli/rpc.py index 25e28f9b..c695402f 100644 --- a/apps/cic-eth/cic_eth/cli/rpc.py +++ b/apps/cic-eth/cic_eth/cli/rpc.py @@ -35,14 +35,14 @@ class RPC: def from_config(config, use_signer=False, default_label='default', signer_label='signer'): chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC')) - RPCConnection.register_location(config.get('RPC_HTTP_PROVIDER'), chain_spec, default_label) + RPCConnection.register_location(config.get('RPC_PROVIDER'), chain_spec, default_label) if use_signer: RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, signer_label) RPCConnection.register_constructor(ConnType.HTTP, EthHTTPSignerConnection, signer_label) RPCConnection.register_constructor(ConnType.HTTP_SSL, EthHTTPSignerConnection, signer_label) RPCConnection.register_location(config.get('SIGNER_PROVIDER'), chain_spec, signer_label) - rpc = RPC(chain_spec, config.get('RPC_HTTP_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER')) + rpc = RPC(chain_spec, config.get('RPC_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER')) logg.info('set up rpc: {}'.format(rpc)) return rpc diff --git a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py index fab470f3..52e8e1d9 100644 --- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py +++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py @@ -69,7 +69,6 @@ from cic_eth.registry import ( ) from cic_eth.task import BaseTask - logging.basicConfig(level=logging.WARNING) logg = logging.getLogger() diff --git a/apps/contract-migration/config.sh b/apps/contract-migration/config.sh index 3831ce7e..858eaf85 100644 --- a/apps/contract-migration/config.sh +++ b/apps/contract-migration/config.sh @@ -36,7 +36,7 @@ export TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOY # Migration variable processing -confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${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 diff --git a/apps/contract-migration/envlist b/apps/contract-migration/envlist index 8613215b..d68d9f44 100644 --- a/apps/contract-migration/envlist +++ b/apps/contract-migration/envlist @@ -56,6 +56,7 @@ ETH_PROVIDER ETH_ABI_DIR SIGNER_SOCKET_PATH SIGNER_SECRET +SIGNER_PROVIDER CELERY_BROKER_URL CELERY_RESULT_URL META_PROVIDER diff --git a/apps/contract-migration/requirements.txt b/apps/contract-migration/requirements.txt index b04c6d90..0e62e29a 100644 --- a/apps/contract-migration/requirements.txt +++ b/apps/contract-migration/requirements.txt @@ -1,5 +1,5 @@ cic-eth[tools]==0.12.4a8 -chainlib-eth>=0.0.9a9,<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 @@ -9,4 +9,4 @@ 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.15a4,<=0.4.15 +crypto-dev-signer>=0.4.15a7,<=0.4.15 diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index b9cd99d5..728356ce 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -3,8 +3,8 @@ set -a . ${DEV_DATA_DIR}/env_reset -WAIT_FOR_TIMEOUT=${WAIT_FOR_TIMEOUT:-60} +WAIT_FOR_TIMEOUT=${WAIT_FOR_TIMEOUT:-60} set -e @@ -109,7 +109,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 -confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${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 diff --git a/apps/contract-migration/run_job.sh b/apps/contract-migration/run_job.sh index fcb62d7e..0df34361 100644 --- a/apps/contract-migration/run_job.sh +++ b/apps/contract-migration/run_job.sh @@ -1,7 +1,7 @@ #! /bin/bash >&2 echo -e "\033[;96mRUNNING\033[;39m configurations" -. ./config.sh +./config.sh if [ $? -ne "0" ]; then >&2 echo -e "\033[;31mFAILED\033[;39m configurations" exit 1; diff --git a/apps/data-seeding/requirements.txt b/apps/data-seeding/requirements.txt index c6931fbd..4c445443 100644 --- a/apps/data-seeding/requirements.txt +++ b/apps/data-seeding/requirements.txt @@ -1,10 +1,10 @@ sarafu-faucet~=0.0.7a1 cic-eth[tools]~=0.12.4a8 cic-types~=0.1.0a14 -crypto-dev-signer>=0.4.15a1,<=0.4.15 +crypto-dev-signer>=0.4.15a4,<=0.4.15 faker==4.17.1 chainsyncer~=0.0.6a3 -chainlib-eth~=0.0.9a7 +chainlib-eth~=0.0.9a13 eth-address-index~=0.2.3a4 eth-contract-registry~=0.6.3a3 eth-accounts-index~=0.1.2a3 diff --git a/docker-compose.yml b/docker-compose.yml index 1df84bdf..c6cfd6eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,8 +94,8 @@ services: RUN_MASK: ${RUN_MASK:-0} # bit flags; 1: contract migrations 2: seed data DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-0} DEV_ETH_GAS_PRICE: $DEV_ETH_GAS_PRICE - CIC_DEFAULT_TOKEN_SYMBOL: ${CIC_DEFAULT_TOKEN_SYMBOL:-SARAFU} TOKEN_NAME: ${TOKEN_NAME:-Sarafu Token} + TOKEN_SYMBOL: ${TOKEN_SYMBOL:-GFT} TOKEN_DECIMALS: $TOKEN_DECIMALS TOKEN_REDISTRIBUTION_PERIOD: $TOKEN_DEMURRAGE_REDISTRIBUTION_PERIOD TOKEN_SUPPLY_LIMIT: $TOKEN_SUPPLY_LIMIT @@ -257,8 +257,9 @@ services: CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} CELERY_DEBUG: ${CELERY_DEBUG:-1} - SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000} - SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000} + #SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000} + SIGNER_PROVIDER: ${SIGNER_PROVIDER:-http://cic-eth-signer:8000} + SIGNER_PROVIDER: http://cic-eth-signer:8000 SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef} ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA} TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1} diff --git a/scripts/dump.sh b/scripts/dump.sh old mode 100755 new mode 100644