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

Upgrade facucet

Browse Source
This commit is contained in:
nolash 2021-03-28 22:54:14 +02:00
parent e3846809a6
commit 792715ca8c
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cic-eth/cic_eth/runnable/daemons/filters/gas.py
View File

@ -46,7 +46,7 @@ class GasFilter(SyncFilter):
if len(txs) > 0: if len(txs) > 0:
s = create_check_gas_task( s = create_check_gas_task(
list(txs.values()), list(txs.values()),
self.chain_spec.asdict(), self.chain_spec,
r[0], r[0],
0, 0,
tx_hashes_hex=list(txs.keys()), tx_hashes_hex=list(txs.keys()),

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

@ -1,4 +1,4 @@
cic-base~=0.1.2a45 cic-base~=0.1.2a46
celery==4.4.7 celery==4.4.7
crypto-dev-signer~=0.4.14a16 crypto-dev-signer~=0.4.14a16
confini~=0.3.6rc3 confini~=0.3.6rc3
@ -10,7 +10,6 @@ websockets==8.1
requests~=2.24.0 requests~=2.24.0
eth_accounts_index~=0.0.11a3 eth_accounts_index~=0.0.11a3
erc20-transfer-authorization~=0.3.1a2 erc20-transfer-authorization~=0.3.1a2
erc20-single-shot-faucet~=0.2.0a8
#simple-rlp==0.1.2 #simple-rlp==0.1.2
uWSGI==2.0.19.1 uWSGI==2.0.19.1
semver==2.13.0 semver==2.13.0
@ -22,4 +21,4 @@ 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
sarafu-faucet==0.0.2a11 sarafu-faucet==0.0.2a12

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

@ -57,9 +57,9 @@ 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.2a45 ARG cic_base_version=0.1.2a46
ARG cic_eth_version=0.10.1a5+build.47c9f168 ARG cic_eth_version=0.10.1a5+build.e3846809
ARG sarafu_faucet_version=0.0.2a11 ARG sarafu_faucet_version=0.0.2a12
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 \
cic-eth==$cic_eth_version \ cic-eth==$cic_eth_version \

2
apps/contract-migration/reset.sh
View File

@ -68,7 +68,7 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
# Sarafu faucet contract # Sarafu faucet contract
>&2 echo "deploy token faucet contract" >&2 echo "deploy token faucet contract"
DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS` DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS`
eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_TOKEN_INDEX_ADDRESS eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_FAUCET_ADDRESS
else else

2
docker-compose.yml
View File

@ -101,7 +101,7 @@ services:
CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis:6379} CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis:6379}
CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis:6379} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis:6379}
DEV_PIP_EXTRA_INDEX_URL: ${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433} DEV_PIP_EXTRA_INDEX_URL: ${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
RUN_MASK: 2 #0: noop 1: contract migrations 2: seed data RUN_MASK: 3 #0: noop 1: contract migrations 2: seed data
command: ["./run_job.sh"] command: ["./run_job.sh"]
#command: ["./reset.sh"] #command: ["./reset.sh"]
depends_on: depends_on: