From 47c9f16806ba89d9b6c2bfac92d7c354f20cc89a Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Sat, 27 Mar 2021 15:49:22 +0100
Subject: [PATCH] Add dedicated rpc signer connection

---
 apps/cic-eth/cic_eth/runnable/daemons/tasker.py  | 3 ++-
 apps/cic-eth/docker/Dockerfile                   | 2 +-
 apps/cic-eth/requirements.txt                    | 8 ++++----
 apps/cic-eth/tests/conftest.py                   | 2 +-
 apps/cic-eth/tests/task/test_task_tx.py          | 1 +
 apps/contract-migration/docker/Dockerfile        | 4 ++--
 apps/contract-migration/scripts/requirements.txt | 4 ++--
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
index 1e1239e2..bb9b9231 100644
--- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
@@ -12,6 +12,7 @@ import websocket
 import celery
 import confini
 from chainlib.connection import RPCConnection
+from chainlib.eth.connection import EthUnixSignerConnection
 from chainlib.chain import ChainSpec
 
 # local imports
@@ -116,7 +117,7 @@ else:
 
 chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
 RPCConnection.register_location(config.get('ETH_PROVIDER'), chain_spec, 'default')
-RPCConnection.register_location(config.get('SIGNER_SOCKET_PATH'), chain_spec, 'signer')
+RPCConnection.register_location(config.get('SIGNER_SOCKET_PATH'), chain_spec, 'signer', constructor=EthUnixSignerConnection)
 
 Otx.tracing = config.true('TASKS_TRACE_QUEUE_STATUS')
 
diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile
index 98d88d6c..8aa32946 100644
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN /usr/local/bin/python -m pip install --upgrade pip
 #	python merge_requirements.py | tee merged_requirements.txt 
 #RUN cd cic-base && \
 #	pip install $pip_extra_index_url_flag -r ./merged_requirements.txt 
-RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a31
+RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a39
 
 COPY cic-eth/scripts/ scripts/
 COPY cic-eth/setup.cfg cic-eth/setup.py ./
diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt
index 430b3d09..0cbdca50 100644
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,8 +1,8 @@
 cic-base~=0.1.2a30
 celery==4.4.7
-crypto-dev-signer~=0.4.14a11
+crypto-dev-signer~=0.4.14a14
 confini~=0.3.6rc3
-cic-eth-registry~=0.5.4a6
+cic-eth-registry~=0.5.4a7
 #cic-bancor~=0.0.6
 redis==3.5.3
 alembic==1.4.2
@@ -17,8 +17,8 @@ semver==2.13.0
 websocket-client==0.57.0
 moolb~=0.1.1b2
 eth-address-index~=0.1.1a5
-chainlib~=0.0.1a36
-hexathon~=0.0.1a6
+chainlib~=0.0.1a42
+hexathon~=0.0.1a7
 chainsyncer~=0.0.1a20
 pysha3==1.0.2
 coincurve==15.0.0
diff --git a/apps/cic-eth/tests/conftest.py b/apps/cic-eth/tests/conftest.py
index 421f9650..5c4c80d7 100644
--- a/apps/cic-eth/tests/conftest.py
+++ b/apps/cic-eth/tests/conftest.py
@@ -16,7 +16,7 @@ from tests.fixtures_database import *
 from tests.fixtures_celery import *
 from tests.fixtures_role import *
 from chainlib.eth.pytest import *
-from contract_registry.pytest import *
+from eth_contract_registry.pytest import *
 from cic_eth_registry.pytest.fixtures_contracts import *
 from cic_eth_registry.pytest.fixtures_tokens import *
 
diff --git a/apps/cic-eth/tests/task/test_task_tx.py b/apps/cic-eth/tests/task/test_task_tx.py
index 9251e3b7..2f223c54 100644
--- a/apps/cic-eth/tests/task/test_task_tx.py
+++ b/apps/cic-eth/tests/task/test_task_tx.py
@@ -2,6 +2,7 @@
 import logging
 
 # external imports
+import pytest
 import celery
 from chainlib.eth.gas import Gas
 from chainlib.eth.nonce import RPCNonceOracle
diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile
index fc26b263..2d862704 100644
--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -57,8 +57,8 @@ WORKDIR /home/grassroots
 USER grassroots
 
 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
-ARG cic_base_version=0.1.2a31
-ARG cic_eth_version=0.10.1a5+build.e72fe5d6
+ARG cic_base_version=0.1.2a39
+ARG cic_eth_version=
 ARG sarafu_faucet_version=0.0.2a11
 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 \
diff --git a/apps/contract-migration/scripts/requirements.txt b/apps/contract-migration/scripts/requirements.txt
index ebd07f44..5d0fde08 100644
--- a/apps/contract-migration/scripts/requirements.txt
+++ b/apps/contract-migration/scripts/requirements.txt
@@ -1,3 +1,3 @@
-cic-base[full_graph]==0.1.2a25
-cic-eth==0.10.1a5+build.11f86d64
+cic-base[full_graph]==0.1.2a31
+cic-eth==0.10.1a5+build.da9d2760
 cic-types==0.1.0a8