diff --git a/apps/cic-eth/cic_eth/runnable/daemons/tracker.py b/apps/cic-eth/cic_eth/runnable/daemons/tracker.py index f9f91629..5cc7f7e7 100644 --- a/apps/cic-eth/cic_eth/runnable/daemons/tracker.py +++ b/apps/cic-eth/cic_eth/runnable/daemons/tracker.py @@ -66,7 +66,6 @@ chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC')) #RPCConnection.register_location(config.get('ETH_PROVIDER'), chain_spec, 'default') cic_base.rpc.setup(chain_spec, config.get('ETH_PROVIDER')) - def main(): # connect to celery celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL')) @@ -76,7 +75,10 @@ def main(): o = block_latest() r = rpc.do(o) - block_offset = int(strip_0x(r), 16) + 1 + block_current = int(r, 16) + block_offset = block_current + 1 + + stat = init_chain_stat(rpc, block_current) logg.debug('starting at block {}'.format(block_offset)) diff --git a/apps/cic-eth/cic_eth/version.py b/apps/cic-eth/cic_eth/version.py index 01bc68bb..c7572135 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, - 'alpha.4', + 'beta.1', ) version_object = semver.VersionInfo( diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index ee48c23d..d60dac16 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.2a60 +RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a61 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 e8f809db..a4cf6a36 100644 --- a/apps/cic-eth/requirements.txt +++ b/apps/cic-eth/requirements.txt @@ -19,7 +19,7 @@ eth-address-index~=0.1.1a7 chainlib~=0.0.2a4 hexathon~=0.0.1a7 chainsyncer~=0.0.1a21 -chainqueue~=0.0.1a6 +chainqueue~=0.0.1a7 pysha3==1.0.2 coincurve==15.0.0 -sarafu-faucet~=0.0.2a16 +sarafu-faucet~=0.0.2a19 diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 14784233..b2282e2b 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -58,8 +58,8 @@ USER grassroots ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 ARG cic_base_version=0.1.2a61 -ARG cic_eth_version=0.11.0a5 -ARG sarafu_faucet_version=0.0.2a16 +ARG cic_eth_version=0.11.0b1 +ARG sarafu_faucet_version=0.0.2a19 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 \ cic-eth==$cic_eth_version \ diff --git a/apps/contract-migration/scripts/requirements.txt b/apps/contract-migration/scripts/requirements.txt index 7a06dd35..5a62a439 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.2a60 -sarafu-faucet==0.0.2a16 -cic-eth==0.11.0a4 +cic-base[full_graph]==0.1.2a61 +sarafu-faucet==0.0.2a17 +cic-eth==0.11.0b1 cic-types==0.1.0a10 crypto-dev-signer==0.4.14a17