Update deps in tasker

apps/cic-eth/cic_eth/eth/account.py

@@ -20,7 +20,7 @@ from chainlib.eth.tx import (
         )
 from chainlib.chain import ChainSpec
 from chainlib.error import JSONRPCException
-from eth_accounts_index import AccountRegistry
+from eth_accounts_index.registry import AccountRegistry # TODO, use interface module instead (needs gas limit method)
 from sarafu_faucet import MinterFaucet
 from chainqueue.db.models.tx import TxCache
 

apps/cic-eth/cic_eth/ext/address.py

@@ -7,7 +7,7 @@ from chainlib.chain import ChainSpec
 from chainlib.connection import RPCConnection
 from chainlib.eth.constant import ZERO_ADDRESS
 from cic_eth_registry import CICRegistry
-from eth_address_declarator import AddressDeclarator
+from eth_address_declarator import Declarator
 
 # local imports
 from cic_eth.task import BaseTask
@@ -23,12 +23,12 @@ def translate_address(address, trusted_addresses, chain_spec, sender_address=ZER
     registry = CICRegistry(chain_spec, rpc)
     
     declarator_address = registry.by_name('AddressDeclarator', sender_address=sender_address)
-    c = AddressDeclarator(chain_spec)
+    c = Declarator(chain_spec)
 
     for trusted_address in trusted_addresses:
         o = c.declaration(declarator_address, trusted_address, address, sender_address=sender_address)
         r = rpc.do(o)
-        declaration_hex = AddressDeclarator.parse_declaration(r)
+        declaration_hex = Declarator.parse_declaration(r)
         declaration_hex = declaration_hex[0].rstrip('0')
         declaration_bytes = bytes.fromhex(declaration_hex)
         declaration = None

apps/cic-eth/requirements.txt

@@ -2,7 +2,7 @@ cic-base==0.1.2b6
 celery==4.4.7
 crypto-dev-signer~=0.4.14b3
 confini~=0.3.6rc3
-cic-eth-registry~=0.5.5a1
+cic-eth-registry~=0.5.5a2
 redis==3.5.3
 alembic==1.4.2
 websockets==8.1
@@ -16,9 +16,9 @@ moolb~=0.1.1b2
 eth-address-index~=0.1.1a10
 chainlib~=0.0.2b1
 hexathon~=0.0.1a7
+pysha3==1.0.2
 chainsyncer[sql]~=0.0.2a2
 chainqueue~=0.0.2a2
-pysha3==1.0.2
-coincurve==15.0.0
 sarafu-faucet==0.0.3a1
+coincurve==15.0.0
 potaahto~=0.0.1a1

apps/contract-migration/docker/Dockerfile

@@ -51,16 +51,17 @@ RUN useradd --create-home grassroots
 WORKDIR /home/grassroots
 USER grassroots
 
+ARG pip_extra_args=""
 ARG pip_index_url=https://pypi.org/simple
 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
 ARG cic_base_version=0.1.2b6
 ARG cic_eth_version=0.11.0b12
 ARG sarafu_faucet_version=0.0.3a1
 ARG sarafu_token_version=0.0.1a6
-RUN pip install --user --index-url $pip_index_url --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \
-	cic-eth==$cic_eth_version \
+RUN pip install --user $pip_extra_args --index-url $pip_index_url --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \
 	sarafu-faucet==$sarafu_faucet_version \
-	sarafu-token==$sarafu_token_version
+	sarafu-token==$sarafu_token_version \
+	cic-eth==$cic_eth_version 
 
 FROM python:3.8.6-slim-buster as runtime-image
 

docker-compose.yml

@@ -76,6 +76,9 @@ services:
 
   contract-migration:
     build:
+      args:
+        pip_index_url: ${PIP_DEFAULT_INDEX_URL:-https://pypi.org/simple}
+        pip_extra_args: $PIP_EXTRA_ARGS
       context: apps/
       dockerfile: contract-migration/docker/Dockerfile
     # image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:latest