From f877218c5599d9cb6fa379a0f955b30f1ab5b4f5 Mon Sep 17 00:00:00 2001 From: Louis Holbrook Date: Tue, 24 Aug 2021 11:35:52 +0000 Subject: [PATCH] Update signer --- apps/cic-cache/requirements.txt | 12 ++--- apps/cic-cache/test_requirements.txt | 4 +- apps/cic-eth/admin_requirements.txt | 8 ++-- apps/cic-eth/cic_eth/runnable/tag.py | 2 +- apps/cic-eth/cic_eth/version.py | 4 +- apps/cic-eth/requirements.txt | 2 +- apps/cic-eth/services_requirements.txt | 14 +++--- apps/cic-eth/test_requirements.txt | 2 +- .../tests/filters/test_callback_filter.py | 1 + apps/cic-eth/tools_requirements.txt | 6 +-- apps/contract-migration/docker/Dockerfile | 8 ++++ .../override_requirements.txt | 3 +- apps/contract-migration/requirements.txt | 20 ++++---- apps/contract-migration/reset.sh | 46 +++++++++---------- apps/contract-migration/seed_cic_eth.sh | 34 ++++++++------ apps/data-seeding/requirements.txt | 18 ++++---- 16 files changed, 98 insertions(+), 86 deletions(-) diff --git a/apps/cic-cache/requirements.txt b/apps/cic-cache/requirements.txt index 890594b..029b8a6 100644 --- a/apps/cic-cache/requirements.txt +++ b/apps/cic-cache/requirements.txt @@ -2,16 +2,14 @@ alembic==1.4.2 confini>=0.3.6rc4,<0.5.0 uwsgi==2.0.19.1 moolb~=0.1.1b2 -cic-eth-registry~=0.5.8a1 +cic-eth-registry~=0.6.1a1 SQLAlchemy==1.3.20 semver==2.13.0 psycopg2==2.8.6 celery==4.4.7 redis==3.5.3 chainsyncer[sql]>=0.0.6a1,<0.1.0 -erc20-faucet>=0.2.4a2, <0.3.0 -#chainlib-eth==0.0.7a5,<0.1.0 -chainlib-eth==0.0.7a5 -#chainlib==0.0.7a4,<0.1.0 -chainlib==0.0.7a4 -eth-address-index>=0.1.4a1,<0.2.0 +erc20-faucet>=0.3.2a1, <0.4.0 +chainlib-eth==0.0.9a2 +chainlib==0.0.9a2 +eth-address-index>=0.2.3a1,<0.3.0 diff --git a/apps/cic-cache/test_requirements.txt b/apps/cic-cache/test_requirements.txt index 9d46b79..a539eca 100644 --- a/apps/cic-cache/test_requirements.txt +++ b/apps/cic-cache/test_requirements.txt @@ -6,5 +6,5 @@ sqlparse==0.4.1 pytest-celery==0.0.0a1 eth_tester==0.5.0b3 py-evm==0.3.0a20 -sarafu-faucet~=0.0.5a2 -erc20-transfer-authorization>=0.3.4a1,<0.4.0 +sarafu-faucet~=0.0.7a1 +erc20-transfer-authorization>=0.3.5a1,<0.4.0 diff --git a/apps/cic-eth/admin_requirements.txt b/apps/cic-eth/admin_requirements.txt index b1dbf3b..a82a8a2 100644 --- a/apps/cic-eth/admin_requirements.txt +++ b/apps/cic-eth/admin_requirements.txt @@ -1,5 +1,5 @@ SQLAlchemy==1.3.20 -cic-eth-registry>=0.5.6a2,<0.6.0 -hexathon~=0.0.1a7 -chainqueue>=0.0.3a1,<0.1.0 -eth-erc20>=0.0.10a3,<0.1.0 +cic-eth-registry>=0.6.1a1,<0.7.0 +hexathon~=0.0.1a8 +chainqueue>=0.0.3a2,<0.1.0 +eth-erc20>=0.1.2a1,<0.2.0 diff --git a/apps/cic-eth/cic_eth/runnable/tag.py b/apps/cic-eth/cic_eth/runnable/tag.py index 6aeffc9..b4bdd83 100644 --- a/apps/cic-eth/cic_eth/runnable/tag.py +++ b/apps/cic-eth/cic_eth/runnable/tag.py @@ -18,7 +18,7 @@ from cic_eth.db.models.base import SessionBase logging.basicConfig(level=logging.WARNING) logg = logging.getLogger() -arg_flags = cic_eth.cli.argflag_std_base +arg_flags = cic_eth.cli.argflag_std_base | cic_eth.cli.Flag.UNSAFE | cic_eth.cli.Flag.CHAIN_SPEC local_arg_flags = cic_eth.cli.argflag_local_taskcallback argparser = cic_eth.cli.ArgumentParser(arg_flags) argparser.add_positional('tag', type=str, help='address tag') diff --git a/apps/cic-eth/cic_eth/version.py b/apps/cic-eth/cic_eth/version.py index f9ac618..be200e5 100644 --- a/apps/cic-eth/cic_eth/version.py +++ b/apps/cic-eth/cic_eth/version.py @@ -9,8 +9,8 @@ import semver version = ( 0, 12, - 2, - 'alpha.4', + 4, + 'alpha.3', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index 078438a..c0b271c 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -1,3 +1,3 @@ celery==4.4.7 -chainlib-eth>=0.0.7a7,<0.1.0 +chainlib-eth>=0.0.9a2,<0.1.0 semver==2.13.0 diff --git a/apps/cic-eth/services_requirements.txt b/apps/cic-eth/services_requirements.txt index 80d8009..b6727fa 100644 --- a/apps/cic-eth/services_requirements.txt +++ b/apps/cic-eth/services_requirements.txt @@ -3,13 +3,13 @@ chainsyncer[sql]>=0.0.6a1,<0.1.0 alembic==1.4.2 confini>=0.3.6rc4,<0.5.0 redis==3.5.3 -hexathon~=0.0.1a7 +hexathon~=0.0.1a8 pycryptodome==3.10.1 liveness~=0.0.1a7 -eth-address-index>=0.1.4a1,<0.2.0 -eth-accounts-index>=0.0.14a1,<0.1.0 -cic-eth-registry>=0.5.8a1,<0.6.0 -erc20-faucet>=0.2.4a2,<0.3.0 -erc20-transfer-authorization>=0.3.4a1,<0.4.0 -sarafu-faucet>=0.0.5a2,<0.1.0 +eth-address-index>=0.2.3a1,<0.3.0 +eth-accounts-index>=0.1.2a1,<0.2.0 +cic-eth-registry>=0.6.1a1,<0.7.0 +erc20-faucet>=0.3.2a1,<0.4.0 +erc20-transfer-authorization>=0.3.5a1,<0.4.0 +sarafu-faucet>=0.0.7a1,<0.1.0 moolb~=0.1.1b2 diff --git a/apps/cic-eth/test_requirements.txt b/apps/cic-eth/test_requirements.txt index bf5ecdc..b9fbab6 100644 --- a/apps/cic-eth/test_requirements.txt +++ b/apps/cic-eth/test_requirements.txt @@ -6,4 +6,4 @@ pytest-redis==2.0.0 redis==3.5.3 eth-tester==0.5.0b3 py-evm==0.3.0a20 -eth-erc20~=0.0.12a1 +eth-erc20~=0.1.2a1 diff --git a/apps/cic-eth/tests/filters/test_callback_filter.py b/apps/cic-eth/tests/filters/test_callback_filter.py index 7f0437b..695155c 100644 --- a/apps/cic-eth/tests/filters/test_callback_filter.py +++ b/apps/cic-eth/tests/filters/test_callback_filter.py @@ -200,6 +200,7 @@ def test_callback_filter( assert r['status'] == 1 rcpt = snake_and_camel(r) + tx.block.hash = rcpt['block_hash'] tx.apply_receipt(rcpt) fltr = CallbackFilter(default_chain_spec, None, None, caller_address=contract_roles['CONTRACT_DEPLOYER']) diff --git a/apps/cic-eth/tools_requirements.txt b/apps/cic-eth/tools_requirements.txt index 9dcf8d5..252bf4d 100644 --- a/apps/cic-eth/tools_requirements.txt +++ b/apps/cic-eth/tools_requirements.txt @@ -1,8 +1,8 @@ -crypto-dev-signer>=0.4.14b7,<=0.4.14 +crypto-dev-signer>=0.4.15a1,<=0.4.15 chainqueue>=0.0.3a1,<0.1.0 confini>=0.3.6rc4,<0.5.0 -cic-eth-registry>=0.5.8a1,<0.6.0 +cic-eth-registry>=0.6.1a1,<0.7.0 redis==3.5.3 -hexathon~=0.0.1a7 +hexathon~=0.0.1a8 pycryptodome==3.10.1 pyxdg==0.27 diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 5f2fd37..b6db65b 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -27,6 +27,7 @@ ENV CONFINI_DIR /usr/local/etc/cic/ COPY config_template/ /usr/local/etc/cic/ COPY requirements.txt . +COPY override_requirements.txt . ARG pip_index_url=https://pypi.org/simple ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433" @@ -39,6 +40,13 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ --trusted-host $pip_trusted_host \ --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ -r requirements.txt +RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \ + pip install --index-url https://pypi.org/simple \ + --force-reinstall \ + --trusted-host $pip_trusted_host \ + --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \ + -r override_requirements.txt + COPY . . RUN chmod +x *.sh diff --git a/apps/contract-migration/override_requirements.txt b/apps/contract-migration/override_requirements.txt index 8f1b185..86b09e1 100644 --- a/apps/contract-migration/override_requirements.txt +++ b/apps/contract-migration/override_requirements.txt @@ -1,3 +1,4 @@ -#eth-contract-registry==0.5.5a3 +eth-contract-registry==0.6.3a2 #erc20-demurrage-token==0.0.2a3 #eth-address-index==0.1.1a12 + diff --git a/apps/contract-migration/requirements.txt b/apps/contract-migration/requirements.txt index f71cb33..36fca8d 100644 --- a/apps/contract-migration/requirements.txt +++ b/apps/contract-migration/requirements.txt @@ -1,10 +1,10 @@ -cic-eth[tools]==0.12.2a4 -eth-erc20>=0.0.12a1,<0.1.0 -erc20-demurrage-token>=0.0.3a4,<0.1.0 -eth-address-index>=0.1.4a1,<0.2.0 -eth-accounts-index>=0.0.14a1,<0.1.0 -cic-eth-registry>=0.5.8a1,<0.6.0 -erc20-faucet>=0.2.4a1,<0.3.0 -erc20-transfer-authorization>=0.3.4a1,<0.4.0 -sarafu-faucet>=0.0.5a7,<0.1.0 -chainlib-eth>=0.0.7a8,<0.1.0 +cic-eth[tools]==0.12.4a3 +chainlib-eth>=0.0.9a2,<0.1.0 +eth-erc20>=0.1.2a1,<0.2.0 +erc20-demurrage-token>=0.0.5a1,<0.1.0 +eth-accounts-index>=0.1.2a1,<0.2.0 +eth-address-index>=0.2.3a3,<0.3.0 +cic-eth-registry>=0.6.1a1,<0.7.0 +erc20-faucet>=0.3.2a1,<0.4.0 +erc20-transfer-authorization>=0.3.5a1,<0.4.0 +sarafu-faucet>=0.0.7a1,<0.1.0 diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 8a9fe55..d6bb04c 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -67,6 +67,9 @@ echo -n 1 > $init_level_file # Wait for the backend to be up, if we know where it is. if [[ -n "${ETH_PROVIDER}" ]]; then + export CONFINI_DIR=$_CONFINI_DIR + unset CONFINI_DIR + if [ ! -z "$DEV_USE_DOCKER_WAIT_SCRIPT" ]; then echo "waiting for ${ETH_PROVIDER}..." ./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}" @@ -82,8 +85,8 @@ if [[ -n "${ETH_PROVIDER}" ]]; then TOKEN_NAME=$TOKEN_SYMBOL fi >&2 echo deploying default token $TOKEN_TYPE - echo giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv - DEV_RESERVE_ADDRESS=`giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv` + echo giftable-token-deploy $fee_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -s -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv + DEV_RESERVE_ADDRESS=`giftable-token-deploy $fee_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -s -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv` elif [ "$TOKEN_TYPE" == "erc20_demurrage_token" ]; then if [ -z "$TOKEN_SYMBOL" ]; then >&2 echo token symbol not set, setting defaults for type $TOKEN_TYPE @@ -99,62 +102,57 @@ if [[ -n "${ETH_PROVIDER}" ]]; then >&2 echo -e "\033[;93mtoken sink address not set, so redistribution will be BURNED\033[;39m" fi fi - export _CONFINI_DIR=$CONFINI_DIR - unset CONFINI_DIR DEV_RESERVE_ADDRESS=`erc20-demurrage-token-deploy $fee_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL -vv -ww -s` - export CONFINI_DIR=$_CONFINI_DIR else >&2 echo unknown token type $TOKEN_TYPE exit 1 fi - echo "giftable-token-gift $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w -a $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT" - giftable-token-gift $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w -a $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT + + echo "giftable-token-gift $fee_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT" + giftable-token-gift $fee_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -u -vv -s -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT >&2 echo "deploy account index contract" - DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy $gas_price_arg -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -vv -w` + DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -vv -s -u -w` >&2 echo "add deployer address as account index writer" - eth-accounts-index-writer $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_ACCOUNT_INDEX_ADDRESS -ww -vv $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER + eth-accounts-index-writer $fee_price_arg -s -u -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -e $DEV_ACCOUNT_INDEX_ADDRESS -ww -vv $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER >&2 echo "deploy contract registry contract" - CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy $gas_price_arg -i $CIC_CHAIN_SPEC -y $DEV_ETH_KEYSTORE_FILE --identifier BancorRegistry --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization -p $ETH_PROVIDER -vv -w` - eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv ContractRegistry $CIC_REGISTRY_ADDRESS - eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS + CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -y $DEV_ETH_KEYSTORE_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry -p $ETH_PROVIDER -vv -s -u -w` + eth-contract-registry-set $fee_price_arg -s -u -w -y $DEV_ETH_KEYSTORE_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv --identifier ContractRegistry $CIC_REGISTRY_ADDRESS + eth-contract-registry-set $fee_price_arg -s -u -w -y $DEV_ETH_KEYSTORE_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv --identifier 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 $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv $declarator_description` - eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AddressDeclarator $DEV_DECLARATOR_ADDRESS + DEV_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -s -u -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv $declarator_description` + eth-contract-registry-set $fee_price_arg -s -u -w -y $DEV_ETH_KEYSTORE_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv --identifier AddressDeclarator $DEV_DECLARATOR_ADDRESS # Deploy transfer authorization contact >&2 echo "deploy transfer auth contract" DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv` - eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS + eth-contract-registry-set $fee_price_arg -s -u -w -y $DEV_ETH_KEYSTORE_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv --identifier TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS # Deploy token index contract >&2 echo "deploy token index contract" - DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv` - eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv TokenRegistry $DEV_TOKEN_INDEX_ADDRESS + DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -s -u $fee_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv` + eth-contract-registry-set $fee_price_arg -s -u -w -y $DEV_ETH_KEYSTORE_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv --identifier TokenRegistry $DEV_TOKEN_INDEX_ADDRESS >&2 echo "add reserve token to token index" - eth-token-index-add $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv -a $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS + eth-token-index-add $fee_price_arg -s -u -w -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv -e $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS # Sarafu faucet contract >&2 echo "deploy token faucet contract" - export _CONFINI_DIR=$CONFINI_DIR - unset CONFINI_DIR DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy $fee_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS -s` >&2 echo "set token faucet amount" sarafu-faucet-set $fee_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -e $DEV_FAUCET_ADDRESS -vv -s --fee-limit 100000 $DEV_FAUCET_AMOUNT - export CONFINI_DIR=$_CONFINI_DIR - >&2 echo "register faucet in registry" - eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_FAUCET_ADDRESS + eth-contract-registry-set -s -u $fee_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv --identifier Faucet $DEV_FAUCET_ADDRESS >&2 echo "set faucet as token minter" - giftable-token-minter $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -a $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv $DEV_FAUCET_ADDRESS + giftable-token-minter -s -u $fee_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -e $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv $DEV_FAUCET_ADDRESS + export CONFINI_DIR=$_CONFINI_DIR else echo "\$ETH_PROVIDER not set!" exit 1 diff --git a/apps/contract-migration/seed_cic_eth.sh b/apps/contract-migration/seed_cic_eth.sh index 29a8022..aefae1c 100755 --- a/apps/contract-migration/seed_cic_eth.sh +++ b/apps/contract-migration/seed_cic_eth.sh @@ -35,10 +35,13 @@ set -a #pip install --extra-index-url $DEV_PIP_EXTRA_INDEX_URL eth-address-index==0.1.1a7 +export CONFINI_DIR=$_CONFINI_DIR +unset CONFINI_DIR + # get required addresses from registries -DEV_TOKEN_INDEX_ADDRESS=`eth-contract-registry-list -i $CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief TokenRegistry` -DEV_ACCOUNT_INDEX_ADDRESS=`eth-contract-registry-list -i $CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief AccountRegistry` -DEV_RESERVE_ADDRESS=`eth-token-index-list -i $CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_TOKEN_INDEX_ADDRESS -f brief $CIC_DEFAULT_TOKEN_SYMBOL` +DEV_TOKEN_INDEX_ADDRESS=`eth-contract-registry-list -u -i $CHAIN_SPEC -p $ETH_PROVIDER -e $CIC_REGISTRY_ADDRESS -vv --raw TokenRegistry` +DEV_ACCOUNT_INDEX_ADDRESS=`eth-contract-registry-list -u -i $CHAIN_SPEC -p $ETH_PROVIDER -e $CIC_REGISTRY_ADDRESS -vv --raw AccountRegistry` +DEV_RESERVE_ADDRESS=`eth-token-index-list -i $CHAIN_SPEC -u -p $ETH_PROVIDER -e $DEV_TOKEN_INDEX_ADDRESS -vv --raw $CIC_DEFAULT_TOKEN_SYMBOL` cat <> $env_out_file cic-eth-tag -i $CHAIN_SPEC ACCOUNT_REGISTRY_WRITER $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER >&2 echo "add acccounts index writer account as writer on contract" -eth-accounts-index-writer -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_ACCOUNT_INDEX_ADDRESS -ww $debug $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER +eth-accounts-index-writer -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -e $DEV_ACCOUNT_INDEX_ADDRESS -ww $debug $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER # Transfer gas to custodial gas provider adddress _CONFINI_DIR=$CONFINI_DIR unset CONFINI_DIR >&2 echo gift gas to gas gifter ->&2 eth-gas --send -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $DEV_ETH_ACCOUNT_GAS_GIFTER $gas_amount +>&2 eth-gas -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $DEV_ETH_ACCOUNT_GAS_GIFTER $gas_amount >&2 echo gift gas to sarafu token owner ->&2 eth-gas --send -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $DEV_ETH_ACCOUNT_SARAFU_GIFTER $gas_amount +>&2 eth-gas -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $DEV_ETH_ACCOUNT_SARAFU_GIFTER $gas_amount >&2 echo gift gas to account index owner ->&2 eth-gas --send -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER $gas_amount +>&2 eth-gas -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -w $debug -a $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER $gas_amount # Send token to token creator >&2 echo "gift tokens to sarafu owner" ->&2 giftable-token-gift -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_RESERVE_ADDRESS --recipient $DEV_ETH_ACCOUNT_SARAFU_GIFTER -w $debug $token_amount +echo "giftable-token-gift -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -e $DEV_RESERVE_ADDRESS -a $DEV_ETH_ACCOUNT_SARAFU_GIFTER -w $debug $token_amount" +>&2 giftable-token-gift -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -e $DEV_RESERVE_ADDRESS -a $DEV_ETH_ACCOUNT_SARAFU_GIFTER -w $debug $token_amount # Send token to token gifter >&2 echo "gift tokens to keystore address" ->&2 giftable-token-gift -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_RESERVE_ADDRESS --recipient $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER -w $debug $token_amount +>&2 giftable-token-gift -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER -e $DEV_RESERVE_ADDRESS -a $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER -w $debug $token_amount >&2 echo "set sarafu token to reserve token (temporarily while bancor contracts are not connected)" echo DEV_ETH_SARAFU_TOKEN_ADDRESS=$DEV_ETH_RESERVE_ADDRESS >> $env_out_file @@ -101,15 +105,17 @@ export DEV_ETH_SARAFU_TOKEN_ADDRESS=$DEV_ETH_RESERVE_ADDRESS # Transfer tokens to gifter address >&2 echo "transfer tokens to token gifter address" ->&2 erc20-transfer -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER --gas-limit 100000 --token-address $DEV_RESERVE_ADDRESS -w $debug $DEV_ETH_ACCOUNT_SARAFU_GIFTER ${token_amount:0:-1} +>&2 erc20-transfer -s -u -y $keystore_file -i $CHAIN_SPEC -p $ETH_PROVIDER --fee-limit 100000 -e $DEV_RESERVE_ADDRESS -w $debug -a $DEV_ETH_ACCOUNT_SARAFU_GIFTER ${token_amount:0:-1} #echo -n 0 > $init_level_file -CONFINI_DIR=$_CONFINI_DIR +#CONFINI_DIR=$_CONFINI_DIR # Remove the SEND (8), QUEUE (16) and INIT (2) locks (or'ed), set by default at migration -cic-eth-ctl -i :: unlock INIT -cic-eth-ctl -i :: unlock SEND -cic-eth-ctl -i :: unlock QUEUE +cic-eth-ctl -i $CHAIN_SPEC unlock INIT +cic-eth-ctl -i $CHAIN_SPEC unlock SEND +cic-eth-ctl -i $CHAIN_SPEC unlock QUEUE + +export CONFINI_DIR=$_CONFINI_DIR set +a set +e diff --git a/apps/data-seeding/requirements.txt b/apps/data-seeding/requirements.txt index 7317ddf..c6efb4b 100644 --- a/apps/data-seeding/requirements.txt +++ b/apps/data-seeding/requirements.txt @@ -1,13 +1,13 @@ -sarafu-faucet~=0.0.5a2 -cic-eth[tools]~=0.12.2a3 +sarafu-faucet~=0.0.7a1 +cic-eth[tools]~=0.12.4a2 cic-types~=0.1.0a14 -crypto-dev-signer~=0.4.14rc1 +crypto-dev-signer>=0.4.15a1,<=0.4.15 faker==4.17.1 chainsyncer~=0.0.6a1 -chainlib-eth~=0.0.7a1 -eth-address-index~=0.1.4a1 -eth-contract-registry~=0.5.8a1 -eth-accounts-index~=0.0.14a1 -eth-erc20~=0.0.12a1 -erc20-faucet~=0.2.4a1 +chainlib-eth~=0.0.9a2 +eth-address-index~=0.2.3a1 +eth-contract-registry~=0.6.3a1 +eth-accounts-index~=0.1.2a1 +eth-erc20~=0.1.2a1 +erc20-faucet~=0.3.2a1 psycopg2==2.8.6