kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add dedicated rpc signer connection

Browse Source
This commit is contained in:
nolash 2021-03-27 15:49:22 +01:00
parent da9d27606e
commit 47c9f16806
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/cic-eth/cic_eth/runnable/daemons/tasker.py
View File

@ -12,6 +12,7 @@ import websocket
import celery import celery
import confini import confini
from chainlib.connection import RPCConnection from chainlib.connection import RPCConnection
from chainlib.eth.connection import EthUnixSignerConnection
from chainlib.chain import ChainSpec from chainlib.chain import ChainSpec
# local imports # local imports
@ -116,7 +117,7 @@ else:
chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC')) 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('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') Otx.tracing = config.true('TASKS_TRACE_QUEUE_STATUS')

2
apps/cic-eth/docker/Dockerfile
View File

@ -29,7 +29,7 @@ RUN /usr/local/bin/python -m pip install --upgrade pip
# python merge_requirements.py | tee merged_requirements.txt # python merge_requirements.py | tee merged_requirements.txt
#RUN cd cic-base && \ #RUN cd cic-base && \
# pip install $pip_extra_index_url_flag -r ./merged_requirements.txt # 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/scripts/ scripts/
COPY cic-eth/setup.cfg cic-eth/setup.py ./ COPY cic-eth/setup.cfg cic-eth/setup.py ./

8
apps/cic-eth/requirements.txt
View File

@ -1,8 +1,8 @@
cic-base~=0.1.2a30 cic-base~=0.1.2a30
celery==4.4.7 celery==4.4.7
crypto-dev-signer~=0.4.14a11 crypto-dev-signer~=0.4.14a14
confini~=0.3.6rc3 confini~=0.3.6rc3
cic-eth-registry~=0.5.4a6 cic-eth-registry~=0.5.4a7
#cic-bancor~=0.0.6 #cic-bancor~=0.0.6
redis==3.5.3 redis==3.5.3
alembic==1.4.2 alembic==1.4.2
@ -17,8 +17,8 @@ semver==2.13.0
websocket-client==0.57.0 websocket-client==0.57.0
moolb~=0.1.1b2 moolb~=0.1.1b2
eth-address-index~=0.1.1a5 eth-address-index~=0.1.1a5
chainlib~=0.0.1a36 chainlib~=0.0.1a42
hexathon~=0.0.1a6 hexathon~=0.0.1a7
chainsyncer~=0.0.1a20 chainsyncer~=0.0.1a20
pysha3==1.0.2 pysha3==1.0.2
coincurve==15.0.0 coincurve==15.0.0

2
apps/cic-eth/tests/conftest.py
View File

@ -16,7 +16,7 @@ from tests.fixtures_database import *
from tests.fixtures_celery import * from tests.fixtures_celery import *
from tests.fixtures_role import * from tests.fixtures_role import *
from chainlib.eth.pytest 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_contracts import *
from cic_eth_registry.pytest.fixtures_tokens import * from cic_eth_registry.pytest.fixtures_tokens import *

1
apps/cic-eth/tests/task/test_task_tx.py
View File

@ -2,6 +2,7 @@
import logging import logging
# external imports # external imports
import pytest
import celery import celery
from chainlib.eth.gas import Gas from chainlib.eth.gas import Gas
from chainlib.eth.nonce import RPCNonceOracle from chainlib.eth.nonce import RPCNonceOracle

4
apps/contract-migration/docker/Dockerfile
View File

@ -57,8 +57,8 @@ WORKDIR /home/grassroots
USER grassroots USER grassroots
ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
ARG cic_base_version=0.1.2a31 ARG cic_base_version=0.1.2a39
ARG cic_eth_version=0.10.1a5+build.e72fe5d6 ARG cic_eth_version=
ARG sarafu_faucet_version=0.0.2a11 ARG sarafu_faucet_version=0.0.2a11
ARG cic_contracts_version=0.0.2a2 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 \ RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \

4
apps/contract-migration/scripts/requirements.txt
View File

@ -1,3 +1,3 @@
cic-base[full_graph]==0.1.2a25 cic-base[full_graph]==0.1.2a31
cic-eth==0.10.1a5+build.11f86d64 cic-eth==0.10.1a5+build.da9d2760
cic-types==0.1.0a8 cic-types==0.1.0a8