diff --git a/apps/cic-cache/requirements.txt b/apps/cic-cache/requirements.txt index 82eb421a..9ea4ffd3 100644 --- a/apps/cic-cache/requirements.txt +++ b/apps/cic-cache/requirements.txt @@ -1,12 +1,12 @@ -cic-base~=0.1.2b6 +cic-base~=0.1.2b8 alembic==1.4.2 confini~=0.3.6rc3 uwsgi==2.0.19.1 moolb~=0.1.0 -cic-eth-registry~=0.5.5a1 +cic-eth-registry~=0.5.5a4 SQLAlchemy==1.3.20 semver==2.13.0 psycopg2==2.8.6 celery==4.4.7 redis==3.5.3 -chainsyncer[sql]~=0.0.2a2 +chainsyncer[sql]~=0.0.2a4 diff --git a/apps/cic-cache/test_requirements.txt b/apps/cic-cache/test_requirements.txt index dce79ea1..e0addadd 100644 --- a/apps/cic-cache/test_requirements.txt +++ b/apps/cic-cache/test_requirements.txt @@ -8,6 +8,4 @@ eth_tester==0.5.0b3 py-evm==0.3.0a20 web3==5.12.2 cic-eth-registry~=0.5.5a3 -giftable-erc20-token~=0.0.8a10 -eth-address-index~=0.1.1a10 -sarafu-faucet~=0.0.3a1 +cic-base[full]==0.1.2b8 diff --git a/apps/cic-eth/cic_eth/eth/erc20.py b/apps/cic-eth/cic_eth/eth/erc20.py index 71dfd6a2..4daf693b 100644 --- a/apps/cic-eth/cic_eth/eth/erc20.py +++ b/apps/cic-eth/cic_eth/eth/erc20.py @@ -6,7 +6,6 @@ import celery from chainlib.eth.constant import ZERO_ADDRESS from chainlib.chain import ChainSpec from chainlib.connection import RPCConnection -from chainlib.eth.erc20 import ERC20 from chainlib.eth.tx import ( TxFormat, unpack, @@ -16,6 +15,7 @@ from cic_eth_registry.erc20 import ERC20Token from hexathon import strip_0x from chainqueue.db.models.tx import TxCache from chainqueue.error import NotLocalTxError +from eth_erc20 import ERC20 # local imports from cic_eth.db.models.base import SessionBase diff --git a/apps/cic-eth/cic_eth/ext/tx.py b/apps/cic-eth/cic_eth/ext/tx.py index a5d59aa7..dc9f0ad2 100644 --- a/apps/cic-eth/cic_eth/ext/tx.py +++ b/apps/cic-eth/cic_eth/ext/tx.py @@ -14,13 +14,13 @@ from chainlib.eth.tx import ( ) from chainlib.eth.block import block_by_number from chainlib.eth.contract import abi_decode_single -from chainlib.eth.erc20 import ERC20 from hexathon import strip_0x from cic_eth_registry import CICRegistry from cic_eth_registry.erc20 import ERC20Token from chainqueue.db.models.otx import Otx from chainqueue.db.enum import StatusEnum from chainqueue.query import get_tx_cache +from eth_erc20 import ERC20 # local imports from cic_eth.queue.time import tx_times diff --git a/apps/cic-eth/cic_eth/version.py b/apps/cic-eth/cic_eth/version.py index a57e9bef..1f75076e 100644 --- a/apps/cic-eth/cic_eth/version.py +++ b/apps/cic-eth/cic_eth/version.py @@ -10,7 +10,7 @@ version = ( 0, 11, 0, - 'beta.11', + 'beta.12', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt index ced81836..f4706436 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -1,25 +1,24 @@ -cic-base==0.1.2b5 +cic-base==0.1.2b8 celery==4.4.7 crypto-dev-signer~=0.4.14b3 confini~=0.3.6rc3 -cic-eth-registry~=0.5.4a16 -#cic-bancor~=0.0.6 +cic-eth-registry~=0.5.5a4 redis==3.5.3 alembic==1.4.2 websockets==8.1 requests~=2.24.0 -eth_accounts_index~=0.0.11a9 -erc20-transfer-authorization~=0.3.1a5 +eth_accounts_index~=0.0.11a11 +erc20-transfer-authorization~=0.3.1a6 uWSGI==2.0.19.1 semver==2.13.0 websocket-client==0.57.0 moolb~=0.1.1b2 -eth-address-index~=0.1.1a9 -chainlib~=0.0.2a20 +eth-address-index~=0.1.1a11 +chainlib~=0.0.3a1 hexathon~=0.0.1a7 -chainsyncer[sql]~=0.0.2a2 +chainsyncer[sql]~=0.0.2a4 chainqueue~=0.0.2a2 pysha3==1.0.2 coincurve==15.0.0 -sarafu-faucet==0.0.2a28 +sarafu-faucet==0.0.3a2 potaahto~=0.0.1a1 diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 523703a5..f20b3046 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -52,14 +52,15 @@ WORKDIR /home/grassroots USER grassroots ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 -ARG cic_base_version=0.1.2a79 -ARG cic_eth_version=0.11.0b8+build.c2286e5c -ARG sarafu_faucet_version=0.0.2a28 -ARG sarafu_token_version=0.0.1a6 -ARG cic_contracts_version=0.0.2a2 -RUN pip install --user --index-url https://pypi.org/simple --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \ +ARG cic_base_version=0.1.2b8 +ARG cic_eth_version=0.11.0b12 +ARG sarafu_faucet_version=0.0.3a2 +ARG sarafu_token_version=0.0.1a8 +#ARG cic_contracts_version=0.0.2a2 +RUN pip install --user --index-url https://pypi.org/simple --extra-index-url $pip_extra_index_url \ + cic-base[full_graph]==$cic_base_version \ cic-eth==$cic_eth_version \ - cic-contracts==$cic_contracts_version \ +# cic-contracts==$cic_contracts_version \ sarafu-faucet==$sarafu_faucet_version \ sarafu-token==$sarafu_token_version diff --git a/apps/contract-migration/scripts/requirements.txt b/apps/contract-migration/scripts/requirements.txt index 8c055b61..92c179a7 100644 --- a/apps/contract-migration/scripts/requirements.txt +++ b/apps/contract-migration/scripts/requirements.txt @@ -1,5 +1,5 @@ -cic-base[full_graph]==0.1.2b2 -sarafu-faucet==0.0.2a28 -cic-eth==0.11.0b10 +cic-base[full_graph]==0.1.2b8 +sarafu-faucet==0.0.3a2 +cic-eth==0.11.0b12 cic-types==0.1.0a10 crypto-dev-signer==0.4.14b3