From 2979f4b34b3a2be933ff6989af5a37e4e0a9ada4 Mon Sep 17 00:00:00 2001 From: nolash Date: Tue, 24 Aug 2021 08:14:23 +0200 Subject: [PATCH] Update all deps to assimilate signer upgrade --- 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/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/requirements.txt | 20 +++++++++---------- apps/contract-migration/reset.sh | 4 ++-- apps/data-seeding/requirements.txt | 18 ++++++++--------- 12 files changed, 47 insertions(+), 48 deletions(-) diff --git a/apps/cic-cache/requirements.txt b/apps/cic-cache/requirements.txt index 890594bf..029b8a61 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 9d46b791..a539ecaa 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 b1dbf3bd..a82a8a28 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/version.py b/apps/cic-eth/cic_eth/version.py index f9ac618b..164a38c6 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.2', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index 078438ae..c0b271cb 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 80d8009c..b6727fad 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 bf5ecdcc..b9fbab61 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 7f0437bc..695155cb 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 9dcf8d51..252bf4d0 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/requirements.txt b/apps/contract-migration/requirements.txt index f71cb33b..f2565dcc 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.4a2 +eth-erc20>=0.1.2a1,<0.2.0 +erc20-demurrage-token>=0.0.5a1,<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 +chainlib-eth>=0.0.9a2,<0.1.0 diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 8a9fe552..8780a473 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -82,8 +82,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 -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 -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 diff --git a/apps/data-seeding/requirements.txt b/apps/data-seeding/requirements.txt index 7317ddf8..c6efb4b8 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