diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index e5bdd2f9..20f1f28b 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.2a62 +RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a64 COPY cic-eth/scripts/ scripts/ COPY cic-eth/setup.cfg cic-eth/setup.py ./ diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 8a583ea1..0ead22f4 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -57,9 +57,9 @@ WORKDIR /home/grassroots USER grassroots ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 -ARG cic_base_version=0.1.2a62 +ARG cic_base_version=0.1.2a64 ARG cic_eth_version=0.11.0b1 -ARG sarafu_faucet_version=0.0.2a19 +ARG sarafu_faucet_version=0.0.2a20 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/cic_eth/traffic/cmd/traffic.py b/apps/contract-migration/scripts/cic_eth/traffic/cmd/traffic.py index 6cf3d965..1e5f58c4 100644 --- a/apps/contract-migration/scripts/cic_eth/traffic/cmd/traffic.py +++ b/apps/contract-migration/scripts/cic_eth/traffic/cmd/traffic.py @@ -241,7 +241,9 @@ class TrafficProvisioner: #callback_queue=queue, ) t = api.balance(account, token.symbol()) - r = t.get_leaf() + r = t.get() + for c in t.collect(): + r = c[1] assert t.successful() #return r[0]['balance_network'] - r[0]['balance_outgoing'] return r[0] diff --git a/apps/contract-migration/scripts/config/app.ini b/apps/contract-migration/scripts/config/app.ini new file mode 100644 index 00000000..fa041acb --- /dev/null +++ b/apps/contract-migration/scripts/config/app.ini @@ -0,0 +1,2 @@ +[app] +service_code = *483*46# diff --git a/apps/contract-migration/scripts/package.json b/apps/contract-migration/scripts/package.json new file mode 100644 index 00000000..b5f273d2 --- /dev/null +++ b/apps/contract-migration/scripts/package.json @@ -0,0 +1,6 @@ +{ + "dependencies": { + "cic-client-meta": "^0.0.7-alpha.6", + "vcard-parser": "^1.0.0" + } +} diff --git a/apps/contract-migration/scripts/requirements.txt b/apps/contract-migration/scripts/requirements.txt index 5a62a439..3499ea7d 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.2a61 -sarafu-faucet==0.0.2a17 +cic-base[full_graph]==0.1.2a64 +sarafu-faucet==0.0.2a20 cic-eth==0.11.0b1 cic-types==0.1.0a10 -crypto-dev-signer==0.4.14a17 +crypto-dev-signer==0.4.14b1