From 97ecce96a850792afc0a35b19977e862c4c9de90 Mon Sep 17 00:00:00 2001 From: nolash Date: Wed, 24 Mar 2021 10:21:25 +0100 Subject: [PATCH] Bump deps and version --- apps/cic-eth/cic_eth/version.py | 2 +- apps/cic-eth/requirements.txt | 25 +++++----- apps/cic-eth/setup.cfg | 1 - apps/contract-migration/docker/Dockerfile | 58 ++++------------------- apps/contract-migration/reset.sh | 21 ++++---- 5 files changed, 33 insertions(+), 74 deletions(-) diff --git a/apps/cic-eth/cic_eth/version.py b/apps/cic-eth/cic_eth/version.py index f242a15e..f51e5d0a 100644 --- a/apps/cic-eth/cic_eth/version.py +++ b/apps/cic-eth/cic_eth/version.py @@ -10,7 +10,7 @@ version = ( 0, 10, 1, - 'alpha.1', + 'alpha.5', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index 5c8f8840..3d6a6810 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -1,26 +1,25 @@ -cic-base~=0.1.1a30 +cic-base~=0.1.2a5 web3==5.12.2 celery==4.4.7 -crypto-dev-signer~=0.4.13rc6 +crypto-dev-signer~=0.4.14a5 confini~=0.3.6rc3 -cic-registry~=0.5.3a22 -cic-bancor~=0.0.6 +cic-eth-registry~=0.5.4a2 +#cic-bancor~=0.0.6 redis==3.5.3 alembic==1.4.2 websockets==8.1 requests~=2.24.0 -eth_accounts_index~=0.0.10a11 -erc20-transfer-authorization~=0.3.0a10 -erc20-single-shot-faucet~=0.2.0a6 -simple-rlp==0.1.2 +eth_accounts_index~=0.0.11a2 +erc20-transfer-authorization~=0.3.1a1 +erc20-single-shot-faucet~=0.2.0a7 +#simple-rlp==0.1.2 uWSGI==2.0.19.1 semver==2.13.0 -eth-gas-proxy==0.0.1a4 websocket-client==0.57.0 moolb~=0.1.1b2 -eth-address-index~=0.1.0a8 -chainlib~=0.0.1a25 -hexathon~=0.0.1a3 -chainsyncer~=0.0.1a19 +eth-address-index~=0.1.1a2 +chainlib~=0.0.1a29 +hexathon~=0.0.1a5 +chainsyncer~=0.0.1a20 pysha3==1.0.2 coincurve==15.0.0 diff --git a/apps/cic-eth/setup.cfg b/apps/cic-eth/setup.cfg index b2243914..8d7b8b94 100644 --- a/apps/cic-eth/setup.cfg +++ b/apps/cic-eth/setup.cfg @@ -32,7 +32,6 @@ packages = cic_eth.db cic_eth.db.models cic_eth.queue - cic_eth.sync cic_eth.ext cic_eth.runnable cic_eth.runnable.daemons diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 91c160a1..af544b56 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -57,54 +57,12 @@ WORKDIR /home/grassroots USER grassroots ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 -ARG cic_base_version=0.1.1a23 -ARG cic_registry_version=0.5.3a24 -ARG cic_eth_version=0.10.0a41 -ARG chainlib_version=0.0.1a21 +ARG cic_base_version=0.1.2a7 +ARG cic_eth_version=0.10.1a5+build.b441abb0 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-registry==$cic_registry_version \ - cic-eth==$cic_eth_version \ - chainlib==$chainlib_version \ - cic-contracts==$cic_contracts_version - -# ARG cic_bancor_url=https://gitlab.com/grassrootseconomics/cic-bancor.git/ -# ARG cic_bancor_contracts_url=https://github.com/bancorprotocol/contracts-solidity -# RUN echo Compile and install bancor protocol contracts && \ -# git clone --depth 1 $cic_bancor_url cic-bancor && \ -# cd cic-bancor - -# RUN cd cic-bancor/python && \ -# pip install --extra-index-url $pip_extra_index_url . - -# This is a temporary solution for building the Bancor contracts using the bancor protocol repository truffle setup -# We should instead flatten the files ourselves and build them with solc in the first image layer in this file -# ARG cic_bancor_commit=a04c7ae6882ea515938d852cc861d59a35070094 -# ARG cic_bancor_url=https://gitlab.com/grassrootseconomics/cic-bancor.git/ -# ARG cic_bancor_contracts_url=https://github.com/bancorprotocol/contracts-solidity -# RUN echo Compile and install bancor protocol contracts && \ -# git clone --depth 1 $cic_bancor_url cic-bancor && \ -# cd cic-bancor && \ -# git fetch --depth 1 origin $cic_bancor_commit && \ -# git checkout $cic_bancor_commit && \ -# # Apparently the git version here doesn't have set-url as a command. *sigh* -# #if [ ! -z $cic_bancor_contracts_url ]; then -# # git submodule set-url bancor $cic_bancor_contracts_url -# #fi -# git submodule init && \ -# git submodule update -# RUN cd root && \ -# . $NVM_DIR/nvm.sh &&\ -# nvm install $BANCOR_NODE_VERSION && \ -# nvm use $BANCOR_NODE_VERSION && \ -# cd - && \ -# cd cic-bancor/bancor && \ -# npm install --python=/usr/bin/python2 && \ -# node_modules/truffle/build/cli.bundled.js compile && \ -# mkdir -vp /usr/local/share/cic/bancor/solidity/build && \ -# cp -vR solidity/build/contracts /usr/local/share/cic/bancor/solidity/build/ -# RUN cd cic-bancor/python && \ -# pip install --extra-index-url $pip_extra_index_url . + cic-eth==$cic_eth_version \ + cic-contracts==$cic_contracts_version FROM python:3.8.6-slim-buster as runtime-image @@ -124,17 +82,19 @@ COPY contract-migration/testdata/pgp testdata/pgp COPY contract-migration/sarafu_declaration.json sarafu_declaration.json COPY contract-migration/keystore keystore COPY contract-migration/envlist . -COPY contract-migration/*.sh ./ # RUN chown grassroots:grassroots .local/ -RUN chown grassroots:grassroots -R . -RUN chmod gu+x *.sh RUN mkdir -p /tmp/cic/config RUN chown grassroots:grassroots /tmp/cic/config # A shared output dir for environment configs RUN chmod a+rwx /tmp/cic/config +COPY contract-migration/*.sh ./ +RUN chown grassroots:grassroots -R . +RUN chmod gu+x *.sh + + USER grassroots ENTRYPOINT [ ] diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 8cc65e21..a167963a 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -5,7 +5,7 @@ set -a DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER} DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER} -DEV_ETH_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000} +DEV_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000} keystore_file=$(realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c) echo "environment:" @@ -29,37 +29,38 @@ if [[ -n "${ETH_PROVIDER}" ]]; then echo "waiting for ${ETH_PROVIDER}..." ./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}" - DEV_RESERVE_ADDRESS=`giftable-token-deploy -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC --account $DEV_ETH_ACCOUNT_RESERVE_MINTER --minter $DEV_ETH_ACCOUNT_RESERVE_MINTER --minter $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER -v -w --name "Sarafu" --symbol "SRF" --decimals 6 $DEV_RESERVE_AMOUNT` + DEV_RESERVE_ADDRESS=`giftable-token-deploy -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC -v -w --name "Sarafu" --symbol "SRF" --decimals 6` + giftable-token-gift -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC -v -w -a $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT #BANCOR_REGISTRY_ADDRESS=`cic-bancor-deploy --bancor-dir /usr/local/share/cic/bancor -z $DEV_ETH_RESERVE_ADDRESS -p $ETH_PROVIDER -o $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER` - DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $keystore_file --writer $DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER -vv -w` + DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $keystore_file -vv -w` - CIC_REGISTRY_ADDRESS=`contract-registry-deploy -i $CIC_CHAIN_SPEC -y $keystore_file -k CICRegistry -k BancorRegistry -k AccountRegistry -k TokenRegistry -k AddressDeclarator -k Faucet -k TransferAuthorization -p $ETH_PROVIDER -vv -w` - cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k CICRegistry -p $ETH_PROVIDER $CIC_REGISTRY_ADDRESS -vv + CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy -i $CIC_CHAIN_SPEC -y $keystore_file --identifier CICRegistry --identifier BancorRegistry --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization -p $ETH_PROVIDER -vv -w` + eth-contract-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv ContractRegistry $CIC_REGISTRY_ADDRESS #cic-registry-set -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k BancorRegistry -p $ETH_PROVIDER $BANCOR_REGISTRY_ADDRESS -vv - cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k AccountRegistry -p $ETH_PROVIDER -vv $DEV_ACCOUNT_INDEX_ADDRESS + eth-contract-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS # Deploy address declarator registry >&2 echo "deploy address declarator contract" declarator_description=0x546869732069732074686520434943206e6574776f726b000000000000000000 DEV_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v $declarator_description` - cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k AddressDeclarator -p $ETH_PROVIDER -vv $DEV_DECLARATOR_ADDRESS + eth-contract-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AddressDeclarator $DEV_DECLARATOR_ADDRESS # Deploy transfer authorization contact >&2 echo "deploy address declarator contract" DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v` - cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k TransferAuthorization -p $ETH_PROVIDER -vv $DEV_TRANSFER_AUTHORIZATION_ADDRESS + eth-contract-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS # Deploy token index contract >&2 echo "deploy token index contract" DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v` - cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k TokenRegistry -p $ETH_PROVIDER -vv $DEV_TOKEN_INDEX_ADDRESS + eth-contract-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv TokenRegistry $DEV_TOKEN_INDEX_ADDRESS # Sarafu faucet contract >&2 echo "deploy token faucet contract" DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v $DEV_RESERVE_ADDRESS --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS` - cic-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k Faucet -p $ETH_PROVIDER -vv $DEV_TOKEN_INDEX_ADDRESS + eth-contract-registry-set -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_TOKEN_INDEX_ADDRESS else