Merge remote-tracking branch 'origin/master' into lash/local-dev-improve

2021-10-20 20:02:19 +02:00
parent e705a94873 d8f51c5bdd
commit a6de7e9fe0
41 changed files with 636 additions and 607 deletions
--- a/apps/contract-migration/config.sh
+++ b/apps/contract-migration/config.sh
@@ -14,6 +14,7 @@ if [ ! -f $WALLET_KEY_FILE ]; then
 	>&2 echo "wallet path '$WALLET_KEY_FILE' does not point to a file"
 	exit 1
 fi
+
 export DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=`eth-keyfile -z -d $WALLET_KEY_FILE`
 noncefile=${DEV_DATA_DIR}/nonce_${DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}

--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -2,7 +2,6 @@ ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"

 FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2

-
 WORKDIR /root

 RUN touch /etc/apt/sources.list.d/ethereum.list
--- a/apps/contract-migration/requirements.txt
+++ b/apps/contract-migration/requirements.txt
@@ -11,4 +11,4 @@ sarafu-faucet>=0.0.7a2,<0.1.0
 confini>=0.4.2rc3,<1.0.0
 crypto-dev-signer>=0.4.15rc2,<=0.4.15
 eth-token-index>=0.2.4a1,<=0.3.0
-okota>=0.2.4a13,<0.3.0
+okota>=0.2.4a15,<0.3.0