From 4fb380a54df6f77f73252a0faa8ba472123e52bc Mon Sep 17 00:00:00 2001 From: nolash Date: Tue, 13 Apr 2021 20:06:27 +0200 Subject: [PATCH] tmp --- apps/contract-migration/docker/Dockerfile | 6 +++--- apps/contract-migration/reset.sh | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index dd2cf26c..666ebe5a 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/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.2a67 -ARG cic_eth_version=0.11.0b1 -ARG sarafu_faucet_version=0.0.2a19 +ARG cic_base_version=0.1.2a68 +ARG cic_eth_version=0.11.0b3 +ARG sarafu_faucet_version=0.0.2a20 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 \ diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 2d81ae64..ae65cf9a 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -7,12 +7,17 @@ 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=$(realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c) +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)` + 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