From e89aec76fa94107a1aa228e4580f879ffd0b94b0 Mon Sep 17 00:00:00 2001 From: Philip Wafula Date: Tue, 21 Sep 2021 05:33:46 +0000 Subject: [PATCH] Fixes migrations in cic-cache (ideally) --- apps/cic-cache/cic_cache/cli/rpc.py | 4 ++-- apps/cic-cache/requirements.txt | 7 +++---- apps/contract-migration/config.sh | 7 +++++-- apps/contract-migration/config/config.ini | 10 ---------- apps/contract-migration/reset.sh | 8 ++++++-- apps/contract-migration/seed_cic_eth.sh | 2 +- docker-compose.yml | 18 ++++++++++-------- scripts/dump.sh | 2 +- 8 files changed, 28 insertions(+), 30 deletions(-) mode change 100644 => 100755 scripts/dump.sh diff --git a/apps/cic-cache/cic_cache/cli/rpc.py b/apps/cic-cache/cic_cache/cli/rpc.py index 7f6500ae..b7383242 100644 --- 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_HTTP_PROVIDER'), chain_spec, 'default') + RPCConnection.register_location(config.get('RPC_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_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-cache/requirements.txt b/apps/cic-cache/requirements.txt index b2216817..8f47f9b5 100644 --- a/apps/cic-cache/requirements.txt +++ b/apps/cic-cache/requirements.txt @@ -9,7 +9,6 @@ psycopg2==2.8.6 celery==4.4.7 redis==3.5.3 chainsyncer[sql]>=0.0.6a3,<0.1.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 +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 diff --git a/apps/contract-migration/config.sh b/apps/contract-migration/config.sh index 858eaf85..819b131c 100644 --- a/apps/contract-migration/config.sh +++ b/apps/contract-migration/config.sh @@ -35,8 +35,11 @@ export TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOY # Migration variable processing - -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-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 cat ${DEV_DATA_DIR}/env_reset diff --git a/apps/contract-migration/config/config.ini b/apps/contract-migration/config/config.ini index 4bce6a78..3c30a030 100644 --- a/apps/contract-migration/config/config.ini +++ b/apps/contract-migration/config/config.ini @@ -1,13 +1,3 @@ -[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 = diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 728356ce..f4d45f7f 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -110,8 +110,12 @@ 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 -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 +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 set +a set +e diff --git a/apps/contract-migration/seed_cic_eth.sh b/apps/contract-migration/seed_cic_eth.sh index eb1bfd59..4d0fcd73 100755 --- a/apps/contract-migration/seed_cic_eth.sh +++ b/apps/contract-migration/seed_cic_eth.sh @@ -82,7 +82,7 @@ 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 diff --git a/docker-compose.yml b/docker-compose.yml index 4c5b8f5f..bcc39136 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -126,8 +126,8 @@ services: EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433} environment: CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS # supplied at contract-config after contract provisioning - ETH_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545} - RPC_HTTP_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545} + ETH_PROVIDER: ${RPC_PROVIDER:-http://eth:8545} + RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} # this is is set at initdb see: postgres/initdb/create_db.sql DATABASE_HOST: ${DATABASE_HOST:-postgres} @@ -217,6 +217,8 @@ services: - ${HTTP_PORT_CIC_CACHE:-63313}:8000 depends_on: - postgres + - cic-cache-tasker + - cic-cache-tracker command: - /bin/bash - -c @@ -240,7 +242,7 @@ services: CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545} - RPC_HTTP_PROVIDER: ${ETH_PROVIDER:-http://eth:8545} + RPC_PROVIDER: ${ETH_PROVIDER:-http://eth:8545} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -294,7 +296,7 @@ services: CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545} - RPC_HTTP_PROVIDER: ${ETH_PROVIDER:-http://eth:8545} + RPC_PROVIDER: ${ETH_PROVIDER:-http://eth:8545} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -344,8 +346,8 @@ services: args: EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433} environment: - RPC_HTTP_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545} - ETH_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545} + RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545} + ETH_PROVIDER: ${RPC_PROVIDER:-http://eth:8545} DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -387,7 +389,7 @@ services: EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433} environment: ETH_PROVIDER: http://eth:8545 - RPC_HTTP_PROVIDER: http://eth:8545 + RPC_PROVIDER: http://eth:8545 DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} @@ -431,7 +433,7 @@ services: EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433} environment: ETH_PROVIDER: http://eth:8545 - RPC_HTTP_PROVIDER: http://eth:8545 + RPC_PROVIDER: http://eth:8545 DATABASE_USER: ${DATABASE_USER:-grassroots} DATABASE_HOST: ${DATABASE_HOST:-postgres} DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} diff --git a/scripts/dump.sh b/scripts/dump.sh old mode 100644 new mode 100755 index dd02ea32..814c451f --- a/scripts/dump.sh +++ b/scripts/dump.sh @@ -1 +1 @@ -docker run -t -v cic-internal-integration_contract-config:/tmp/cic/config cic-internal-integration_contract-migration cat /tmp/cic/config/env_reset +docker run -t -v --rm cic-internal-integration_contract-config:/tmp/cic/config busybox cat /tmp/cic/config/env_reset